Upgrade to 6.0.0

mythz · mythz · commit 237a371d5abb · 2022-01-24T20:11:58.000+08:00
diff --git a/NuGet.Config b/NuGet.Config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="ServiceStack CI feed" value="http://build.servicestack.net/guestAuth/app/nuget/v1/FeedService.svc" />
+    <!-- <add key="ServiceStack CI feed" value="http://build.servicestack.net/guestAuth/app/nuget/v1/FeedService.svc" /> -->
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
 </configuration>
diff --git a/build/build-core.proj b/build/build-core.proj
@@ -4,7 +4,7 @@
     <Import Project="$(MSBuildProjectDirectory)/build.tasks" />
 
     <PropertyGroup>
-        <MajorVersion Condition="$(MajorVersion) == ''">5</MajorVersion>
+        <MajorVersion Condition="$(MajorVersion) == ''">6</MajorVersion>
         <MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
         <PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
     </PropertyGroup>
@@ -41,7 +41,6 @@
     <!-- need to remove old caches from nuget restore from .Core csproj's -->
     <Target Name="ClearNuGetRestoreCaches">
         <RemoveDir Directories="$(SrcDir)/ServiceStack.Text/obj" />
-        <RemoveDir Directories="$(SrcDir)/ServiceStack.Memory/obj" />
         <RemoveDir Directories="$(TestsDir)/ServiceStack.Text.Tests/obj" />
         <RemoveDir Directories="$(TestsDir)/ServiceStack.Text.TestsConsole/obj" />
     </Target>
diff --git a/build/build-deps.proj b/build/build-deps.proj
@@ -4,7 +4,7 @@
     <Import Project="$(MSBuildProjectDirectory)/build.tasks" />
 
     <PropertyGroup>
-        <MajorVersion Condition="$(MajorVersion) == ''">5</MajorVersion>
+        <MajorVersion Condition="$(MajorVersion) == ''">6</MajorVersion>
         <MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
         <PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
     </PropertyGroup>
@@ -32,14 +32,12 @@
 
     <Target Name="BuildSolutions">
         <CallTarget Targets="ClearNuGetRestoreCaches" />
-        <MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Memory/ServiceStack.Memory.csproj" Targets="Restore" />
         <MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text/ServiceStack.Text.csproj" Targets="Restore" />
     </Target>
 
     <!-- need to remove old caches from nuget restore from .Core csproj's -->
     <Target Name="ClearNuGetRestoreCaches">
         <RemoveDir Directories="$(SrcDir)/ServiceStack.Text/obj" />
-        <RemoveDir Directories="$(SrcDir)/ServiceStack.Memory/obj" />
         <RemoveDir Directories="$(TestsDir)/ServiceStack.Text.Tests/obj" />
         <RemoveDir Directories="$(TestsDir)/ServiceStack.Text.TestsConsole/obj" />
     </Target>
@@ -69,11 +67,6 @@
 
     <Target Name="Default" DependsOnTargets="$(DoBuildSolutionsDependsOn)">
 
-        <!-- ServiceStack.Memory -->
-        <MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Memory/ServiceStack.Memory.csproj"
-                 Targets="Build;Pack"
-                 Properties="Configuration=$(Configuration)" />
-
         <!-- ServiceStack.Text -->
         <MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text/ServiceStack.Text.csproj"
                  Targets="Build;Pack"
diff --git a/build/build.proj b/build/build.proj
@@ -4,7 +4,7 @@
     <Import Project="$(MSBuildProjectDirectory)/build.tasks" />
 
     <PropertyGroup>
-        <MajorVersion Condition="$(MajorVersion) == ''">5</MajorVersion>
+        <MajorVersion Condition="$(MajorVersion) == ''">6</MajorVersion>
         <MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
         <PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
     </PropertyGroup>
@@ -47,7 +47,6 @@
     <!-- need to remove old caches from nuget restore from .Core csproj's -->
     <Target Name="ClearNuGetRestoreCaches">
         <RemoveDir Directories="$(SrcDir)/ServiceStack.Text/obj" />
-        <RemoveDir Directories="$(SrcDir)/ServiceStack.Memory/obj" />
         <RemoveDir Directories="$(TestsDir)/ServiceStack.Text.Tests/obj" />
         <RemoveDir Directories="$(TestsDir)/ServiceStack.Text.TestsConsole/obj" />
     </Target>
@@ -77,11 +76,6 @@
 
     <Target Name="Default" DependsOnTargets="$(DoBuildSolutionsDependsOn)">
 
-        <!-- ServiceStack.Memory -->
-        <MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Memory/ServiceStack.Memory.csproj"
-                 Targets="Build;Pack"
-                 Properties="Configuration=$(Configuration)" />
-
         <!-- ServiceStack.Text -->
         <MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text/ServiceStack.Text.csproj"
                  Targets="Build;Pack"
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>5.14.0</Version>
+    <Version>6.0.0</Version>
     <Authors>ServiceStack</Authors>
     <Company>ServiceStack, Inc.</Company>
     <Copyright>&#169; 2008-2022 ServiceStack, Inc</Copyright>
@@ -24,7 +24,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net452' OR '$(TargetFramework)' == 'net46'  OR '$(TargetFramework)' == 'net472' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <DefineConstants>$(DefineConstants);NETFX;NET45</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>False</DelaySign>
diff --git a/src/ServiceStack.Text.sln b/src/ServiceStack.Text.sln
@@ -21,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Text.Tests", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Text.TestsConsole", "..\tests\ServiceStack.Text.TestsConsole\ServiceStack.Text.TestsConsole.csproj", "{DD3BEB33-2509-423A-8545-CE1A83684530}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Memory", "ServiceStack.Memory\ServiceStack.Memory.csproj", "{7128E4DB-6C8B-4EFC-A04D-DDDF8A58BB53}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text.Benchmarks", "..\tests\ServiceStack.Text.Benchmarks\ServiceStack.Text.Benchmarks.csproj", "{FF1E5617-FD95-496F-B591-17DA6E0B364F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Northwind.Common", "..\tests\Northwind.Common\Northwind.Common.csproj", "{573926E5-F332-462D-A740-31706708A032}"
@@ -45,10 +43,6 @@ Global
 		{DD3BEB33-2509-423A-8545-CE1A83684530}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DD3BEB33-2509-423A-8545-CE1A83684530}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD3BEB33-2509-423A-8545-CE1A83684530}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7128E4DB-6C8B-4EFC-A04D-DDDF8A58BB53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7128E4DB-6C8B-4EFC-A04D-DDDF8A58BB53}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7128E4DB-6C8B-4EFC-A04D-DDDF8A58BB53}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7128E4DB-6C8B-4EFC-A04D-DDDF8A58BB53}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF1E5617-FD95-496F-B591-17DA6E0B364F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FF1E5617-FD95-496F-B591-17DA6E0B364F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FF1E5617-FD95-496F-B591-17DA6E0B364F}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/src/ServiceStack.Text/Env.cs b/src/ServiceStack.Text/Env.cs
@@ -117,7 +117,7 @@ static Env()
 
         public static string VersionString { get; set; }
 
-        public static decimal ServiceStackVersion = 5.14m;
+        public static decimal ServiceStackVersion = 6.00m;
 
         public static bool IsLinux { get; set; }
 
diff --git a/src/ServiceStack.Text/MemoryProvider.cs b/src/ServiceStack.Text/MemoryProvider.cs
@@ -13,7 +13,7 @@ public abstract class MemoryProvider
     {
         public static MemoryProvider Instance =
 #if NETCORE && !NETSTANDARD2_0
-            ServiceStack.Memory.NetCoreMemory.Provider;
+            NetCoreMemory.Provider;
 #else
             DefaultMemory.Provider;
 #endif
diff --git a/src/ServiceStack.Text/NetCoreMemory.cs b/src/ServiceStack.Text/NetCoreMemory.cs
@@ -7,11 +7,10 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using ServiceStack.Text;
 using ServiceStack.Text.Common;
 using ServiceStack.Text.Pools;
 
-namespace ServiceStack.Memory
+namespace ServiceStack.Text
 {
     public sealed class NetCoreMemory : MemoryProvider
     {
diff --git a/src/ServiceStack.Text/Properties/AssemblyInfo.cs b/src/ServiceStack.Text/Properties/AssemblyInfo.cs
@@ -2,4 +2,4 @@
 
 [assembly: ComVisible(false)]
 [assembly: Guid("a352d4d3-df2a-4c78-b646-67181a6333a6")]
-[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
+[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]
diff --git a/src/ServiceStack.Text/ServiceStack.Text.Core.csproj b/src/ServiceStack.Text/ServiceStack.Text.Core.csproj
@@ -3,8 +3,7 @@
     <PackageId>ServiceStack.Text.Core</PackageId>
     <AssemblyName>ServiceStack.Text</AssemblyName>
     <RootNamespace>ServiceStack.Text</RootNamespace>
-    <!-- <TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks> -->
-    <TargetFrameworks>netstandard2.0;netcoreapp2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <Title>ServiceStack.Text .NET Standard 2.0</Title>
     <PackageDescription>
       .NET's fastest JSON, JSV and CSV Text Serializers. Fast, Light, Resilient.
@@ -14,9 +13,6 @@
     <PackageTags>JSON;Text;Serializer;CSV;JSV;HTTP;Auto Mapping;Dump;Reflection;JS;Utils;Fast</PackageTags>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>$(DefineConstants);NETCORE;NETCORE2_1</DefineConstants>
-  </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <DefineConstants>$(DefineConstants);NETSTANDARD;NET6_0</DefineConstants>
   </PropertyGroup>
@@ -28,11 +24,6 @@
     <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
-    <PackageReference Include="System.Reflection.Emit.LightWeight" Version="4.7.0" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
diff --git a/src/ServiceStack.Text/ServiceStack.Text.csproj b/src/ServiceStack.Text/ServiceStack.Text.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <PackageId>ServiceStack.Text</PackageId>
     <AssemblyName>ServiceStack.Text</AssemblyName>
-    <TargetFrameworks>net45;netstandard2.0;netcoreapp2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
     <Title>.NET's fastest JSON Serializer by ServiceStack</Title>
     <PackageDescription>
       .NET's fastest JSON, JSV and CSV Text Serializers. Fast, Light, Resilient.
@@ -15,28 +15,20 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>  
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>$(DefineConstants);NETCORE;NETCORE2_1</DefineConstants>
-  </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <DefineConstants>$(DefineConstants);NETCORE;NET6_0;NET6_0_OR_GREATER</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Memory" Version="4.5.4" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <Reference Include="System.Configuration" />
   </ItemGroup>  
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
-    <PackageReference Include="System.Reflection.Emit.LightWeight" Version="4.7.0" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>5.14.0</Version>
+    <Version>6.0.0</Version>
     <LangVersion>latest</LangVersion>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
   </PropertyGroup>
@@ -10,18 +10,6 @@
     <DefineConstants>DEBUG</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <DefineConstants>$(DefineConstants);NETFX;NET45</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <DefineConstants>$(DefineConstants);NETFX;NET46</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>$(DefineConstants);NETFX;NET461</DefineConstants>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <DefineConstants>$(DefineConstants);NETFX;NET472</DefineConstants>
   </PropertyGroup>
@@ -30,15 +18,11 @@
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_1</DefineConstants>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <DefineConstants>$(DefineConstants);NET6_0;NET6_0_OR_GREATER</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0' ">
     <DefineConstants>$(DefineConstants);NETCORE;NETCORE_SUPPORT</DefineConstants>
   </PropertyGroup>
 
diff --git a/tests/Northwind.Common/Northwind.Common.csproj b/tests/Northwind.Common/Northwind.Common.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <AssemblyName>Northwind.Common</AssemblyName>
     <PackageId>Northwind.Common</PackageId>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
@@ -29,25 +29,18 @@
     <PackageReference Include="ServiceStack.Interfaces" Version="5.*" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <DefineConstants>$(DefineConstants);NET45</DefineConstants>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <Reference Include="System.Configuration" />
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
-    <PackageReference Include="System.Reflection.Emit.LightWeight" Version="4.7.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-  </ItemGroup>
 
 </Project>
diff --git a/tests/ServiceStack.Text.Benchmarks/MemoryProviderBenchmarks.cs b/tests/ServiceStack.Text.Benchmarks/MemoryProviderBenchmarks.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Globalization;
 using BenchmarkDotNet.Attributes;
-using ServiceStack.Memory;
 
 namespace ServiceStack.Text.Benchmarks
 {
diff --git a/tests/ServiceStack.Text.Benchmarks/ServiceStack.Text.Benchmarks.csproj b/tests/ServiceStack.Text.Benchmarks/ServiceStack.Text.Benchmarks.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.10.14" />
@@ -10,7 +10,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\ServiceStack.Text\ServiceStack.Text.csproj" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETCORE;NETCORE2_1</DefineConstants>
   </PropertyGroup>
 </Project>
diff --git a/tests/ServiceStack.Text.Tests/DataContractTests.cs b/tests/ServiceStack.Text.Tests/DataContractTests.cs
@@ -258,40 +258,13 @@ public void Json_Serialize_Should_Respects_DataContract_Field_Name_With_Bytes_De
             Assert.IsTrue (t.Bytes.AreEqual (new byte[] { 0x61, 0x62 }));
         }
 
-#if !NETCORE
-        [Test]
-        public void Can_get_weak_DataMember()
-        {
-            var dto = new ClassOne();
-            var dataMemberAttr = dto.GetType().GetProperty("Id").GetWeakDataMember();
-            Assert.That(dataMemberAttr.Name, Is.Null);
-
-            dataMemberAttr = dto.GetType().GetProperty("List").GetWeakDataMember();
-            Assert.That(dataMemberAttr.Name, Is.EqualTo("listClassTwo"));
-            Assert.That(dataMemberAttr.Order, Is.EqualTo(1));
-        }
-#endif
-
         [DataContract(Name = "my-class", Namespace = "http://schemas.ns.com")]
         public class MyClass
         {
             [DataMember(Name = "some-title")]
             public string Title { get; set; }
         }
 
-#if !NETCORE
-        [Test]
-        public void Can_get_weak_DataContract()
-        {
-            var mc = new MyClass { Title = "Some random title" };
-
-            var attr = mc.GetType().GetWeakDataContract();
-
-            Assert.That(attr.Name, Is.EqualTo("my-class"));
-            Assert.That(attr.Namespace, Is.EqualTo("http://schemas.ns.com"));
-        }
-#endif
-
         [Test]
         public void Does_use_DataMember_Name()
         {
diff --git a/tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj b/tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj
@@ -54,7 +54,6 @@
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <ProjectReference Include="..\..\src\ServiceStack.Memory\ServiceStack.Memory.csproj" />
     <PackageReference Include="System.Collections.Specialized" Version="4.*" />
     <PackageReference Include="System.Collections.NonGeneric" Version="4.*" />
     <PackageReference Include="System.Diagnostics.TraceSource" Version="4.*" />

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public abstract class MemoryProvider`
`13`	`13`	`{`
`14`	`14`	`public static MemoryProvider Instance =`
`15`	`15`	`#if NETCORE && !NETSTANDARD2_0`
`16`		`- ServiceStack.Memory.NetCoreMemory.Provider;`
	`16`	`+ NetCoreMemory.Provider;`
`17`	`17`	`#else`
`18`	`18`	`DefaultMemory.Provider;`
`19`	`19`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,10 @@`
`7`	`7`	`using System.Text;`
`8`	`8`	`using System.Threading;`
`9`	`9`	`using System.Threading.Tasks;`
`10`		`-using ServiceStack.Text;`
`11`	`10`	`using ServiceStack.Text.Common;`
`12`	`11`	`using ServiceStack.Text.Pools;`
`13`	`12`
`14`		`-namespace ServiceStack.Memory`
	`13`	`+namespace ServiceStack.Text`
`15`	`14`	`{`
`16`	`15`	`public sealed class NetCoreMemory : MemoryProvider`
`17`	`16`	`{`