code cleanup

mythz · mythz · commit be154747f1e3 · 2022-01-31T13:28:37.000+08:00
diff --git a/src/ServiceStack.Client/ContentFormat.cs b/src/ServiceStack.Client/ContentFormat.cs
@@ -56,7 +56,8 @@ public static RequestAttributes GetEndpointAttributes(string contentType)
             return RequestAttributes.FormatOther;
         }
         
-        public static readonly Dictionary<string, string> ContentTypeAliases = new Dictionary<string, string> {
+        public static readonly Dictionary<string, string> ContentTypeAliases = new()
+        {
             { MimeTypes.JsonText, MimeTypes.Json },
             { MimeTypes.XmlText, MimeTypes.Xml },
             { MimeTypes.JsvText, MimeTypes.Jsv },
diff --git a/src/ServiceStack.Kestrel/ServiceStack.Kestrel.csproj b/src/ServiceStack.Kestrel/ServiceStack.Kestrel.csproj
@@ -12,6 +12,12 @@
         </PackageDescription>
         <PackageTags>ServiceStack;SelfHost;Host;Kestrel;HTTP;Server</PackageTags>
     </PropertyGroup>
+    <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+        <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD2_0</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+        <DefineConstants>$(DefineConstants);NETCORE;NET6_0;NET6_0_OR_GREATER</DefineConstants>
+    </PropertyGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\ServiceStack.Interfaces\ServiceStack.Interfaces.csproj"/>
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/ZipTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/ZipTests.cs
@@ -31,7 +31,7 @@ private static void DoesCompress(IStreamCompressor compressor, string text)
         [Test]
         public void Can_zip_and_unzip_bytes_using_BrotliStream()
         {
-            DoesCompress(StreamCompressors.Assert("br"), "hello zip"); //CompressionTypes.Brotli
+            DoesCompress(StreamCompressors.GetRequired(CompressionTypes.Brotli), "hello zip");
         }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ public static RequestAttributes GetEndpointAttributes(string contentType)`
`56`	`56`	`return RequestAttributes.FormatOther;`
`57`	`57`	`}`
`58`	`58`
`59`		`- public static readonly Dictionary<string, string> ContentTypeAliases = new Dictionary<string, string> {`
	`59`	`+ public static readonly Dictionary<string, string> ContentTypeAliases = new()`
	`60`	`+ {`
`60`	`61`	`{ MimeTypes.JsonText, MimeTypes.Json },`
`61`	`62`	`{ MimeTypes.XmlText, MimeTypes.Xml },`
`62`	`63`	`{ MimeTypes.JsvText, MimeTypes.Jsv },`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ private static void DoesCompress(IStreamCompressor compressor, string text)`
`31`	`31`	`[Test]`
`32`	`32`	`public void Can_zip_and_unzip_bytes_using_BrotliStream()`
`33`	`33`	`{`
`34`		`- DoesCompress(StreamCompressors.Assert("br"), "hello zip"); //CompressionTypes.Brotli`
	`34`	`+ DoesCompress(StreamCompressors.GetRequired(CompressionTypes.Brotli), "hello zip");`
`35`	`35`	`}`
`36`	`36`	`#endif`
`37`	`37`