Merge remote-tracking branch 'origin/master' into master

Author: Layoric

src/NuGet.Config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="ServiceStack MyGet feed" value="https://www.myget.org/F/servicestack" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="ServiceStack Pre-Release" value="https://f.feedz.io/servicestack/pre-release/nuget/index.json" />
   </packageSources>
 </configuration>

src/Test.Playground/Program.cs

@@ -5,12 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ServiceStack" Version="6.*" />
-    <PackageReference Include="ServiceStack.OrmLite" Version="6.*" />
-    <PackageReference Include="ServiceStack.Text" Version="6.*" />
-    <PackageReference Include="ServiceStack.Redis" Version="6.*" />
-    <PackageReference Include="ServiceStack.Client" Version="6.*" />
-    <PackageReference Include="ServiceStack.Common" Version="6.*" />
     <PackageReference Include="ServiceStack.Server" Version="6.*" />
   </ItemGroup>
 

src/Test.Playground/Properties/launchSettings.json

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/Test.Playground/Startup.cs

@@ -105,6 +105,12 @@ public abstract class HelloBase
         public int Id { get; set; }
     }
 
+    public class SubType
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+    
     public abstract class HelloResponseBase
     {
         public int RefId { get; set; }
@@ -120,9 +126,4 @@ public abstract class HelloWithReturnResponse
         public string Result { get; set; }
     }
 
-    public class SubType
-    {
-        public int Id { get; set; }
-        public string Name { get; set; }
-    }
 }