Merge pull request #51 from AArnott/polytype

Switch dependency from typeshape-csharp to PolyType
AArnott · Nov 7, 2024 · 65b43cf · 65b43cf
2 parents ec9f3dc + 679f1eb
commit 65b43cf
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 24 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,6 +5,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     <RoslynVersion>4.11.0</RoslynVersion>
+    <PolyTypeVersion>0.15.3-gdec65ec2a5</PolyTypeVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
@@ -17,7 +18,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
     <PackageVersion Include="PolySharp" Version="1.14.1" />
-    <PackageVersion Include="typeshape-csharp" Version="0.14.1" />
+    <PackageVersion Include="PolyType" Version="$(PolyTypeVersion)" />
     <PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="xunit" Version="2.9.2" />

diff --git a/src/Nerdbank.MessagePack.Analyzers/Constants.cs b/src/Nerdbank.MessagePack.Analyzers/Constants.cs
@@ -9,7 +9,7 @@ public static class PropertyShapeAttribute
 	{
 		public const string TypeName = "PropertyShapeAttribute";
 		public const string IgnoreProperty = "Ignore";
-		public static readonly ImmutableArray<string> Namespace = ["TypeShape"];
+		public static readonly ImmutableArray<string> Namespace = ["PolyType"];
 	}
 
 	public static class KeyAttribute

diff --git a/src/Nerdbank.MessagePack.Analyzers/ReferenceSymbols.cs b/src/Nerdbank.MessagePack.Analyzers/ReferenceSymbols.cs
@@ -56,7 +56,7 @@ internal static bool TryCreate(Compilation compilation, [NotNullWhen(true)] out
 			return false;
 		}
 
-		INamedTypeSymbol? propertyShapeAttribute = compilation.GetTypeByMetadataName("TypeShape.PropertyShapeAttribute");
+		INamedTypeSymbol? propertyShapeAttribute = compilation.GetTypeByMetadataName("PolyType.PropertyShapeAttribute");
 		if (propertyShapeAttribute is null)
 		{
 			referenceSymbols = null;

diff --git a/src/Nerdbank.MessagePack/Nerdbank.MessagePack.csproj b/src/Nerdbank.MessagePack/Nerdbank.MessagePack.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Validation" PrivateAssets="compile" />
     <PackageReference Include="Nerdbank.Streams" />
-    <PackageReference Include="typeshape-csharp" />
+    <PackageReference Include="PolyType" />
   </ItemGroup>
   <ItemGroup>
     <None Update="Converters\IntConverters.tt">

diff --git a/src/Nerdbank.MessagePack/Usings.cs b/src/Nerdbank.MessagePack/Usings.cs
@@ -4,5 +4,5 @@
 global using System.Buffers;
 global using Nerdbank.MessagePack.Converters;
 global using Nerdbank.MessagePack.Utilities;
-global using TypeShape;
-global using TypeShape.Abstractions;
+global using PolyType;
+global using PolyType.Abstractions;
diff --git a/test/Benchmarks/Usings.cs b/test/Benchmarks/Usings.cs
@@ -6,5 +6,5 @@
 global using BenchmarkDotNet.Jobs;
 global using Nerdbank.MessagePack;
 global using Nerdbank.Streams;
-global using TypeShape;
+global using PolyType;
 global using MsgPackCSharp = global::MessagePack;
diff --git a/test/Nerdbank.MessagePack.Analyzers.Tests/ConverterAnalyzersTests.cs b/test/Nerdbank.MessagePack.Analyzers.Tests/ConverterAnalyzersTests.cs
@@ -9,7 +9,7 @@ public class ConverterAnalyzersTests
 	public async Task NoIssues()
 	{
 		string source = /* lang=c#-test */ """
-			using TypeShape;
+			using PolyType;
 			using Nerdbank.MessagePack;
 
 			public class MyType { }
@@ -28,8 +28,8 @@ public class MyTypeConverter : MessagePackConverter<MyType>
 	public async Task CreatesNewSerializer()
 	{
 		string source = /* lang=c#-test */ """
-			using TypeShape;
-			using TypeShape.Abstractions;
+			using PolyType;
+			using PolyType.Abstractions;
 			using Nerdbank.MessagePack;
 
 			public partial class MyType : IShapeable<MyType>

diff --git a/test/Nerdbank.MessagePack.Analyzers.Tests/KeyAttributeUseAnalyzerTests.cs b/test/Nerdbank.MessagePack.Analyzers.Tests/KeyAttributeUseAnalyzerTests.cs
@@ -9,7 +9,7 @@ public class KeyAttributeUseAnalyzerTests
 	public async Task NoIssues()
 	{
 		string source = /* lang=c#-test */ """
-			using TypeShape;
+			using PolyType;
 			using Nerdbank.MessagePack;
 
 			[GenerateShape]
@@ -33,7 +33,7 @@ public class MyType
 	public async Task KeyReuseInOneClass()
 	{
 		string source = /* lang=c#-test */ """
-			using TypeShape;
+			using PolyType;
 			using Nerdbank.MessagePack;
 
 			[GenerateShape]
@@ -54,7 +54,7 @@ public class MyType
 	public async Task KeyReuseAcrossClassHierarchy()
 	{
 		string source = /* lang=c#-test */ """
-			using TypeShape;
+			using PolyType;
 			using Nerdbank.MessagePack;
 
 			[GenerateShape]
@@ -79,7 +79,7 @@ public class MyType : MyBaseType
 	public async Task MissingKey()
 	{
 		string source = /* lang=c#-test */ """
-			using TypeShape;
+			using PolyType;
 			using Nerdbank.MessagePack;
 
 			[GenerateShape]
@@ -99,7 +99,7 @@ public class MyType
 	public async Task MissingKeyOnBaseType()
 	{
 		string source = /* lang=c#-test */ """
-			using TypeShape;
+			using PolyType;
 			using Nerdbank.MessagePack;
 
 			[GenerateShape]
@@ -123,7 +123,7 @@ public class MyType : {|NBMsgPack001:MyBaseType|}
 	public async Task KeyOnNonSerializedInternalProperty()
 	{
 		string source = /* lang=c#-test */ """
-			using TypeShape;
+			using PolyType;
 			using Nerdbank.MessagePack;
 
 			[GenerateShape]
@@ -144,7 +144,7 @@ public class MyType
 	public async Task KeyOnNonSerializedPublicProperty()
 	{
 		string source = /* lang=c#-test */ """
-			using TypeShape;
+			using PolyType;
 			using Nerdbank.MessagePack;
 
 			[GenerateShape]

diff --git a/test/Nerdbank.MessagePack.Analyzers.Tests/MessagePackConverterAttributeAnalyzerTests.cs b/test/Nerdbank.MessagePack.Analyzers.Tests/MessagePackConverterAttributeAnalyzerTests.cs
@@ -9,7 +9,7 @@ public class MessagePackConverterAttributeAnalyzerTests
 	public async Task NoIssues()
 	{
 		string source = /* lang=c#-test */ """
-			using TypeShape;
+			using PolyType;
 			using Nerdbank.MessagePack;
 
 			[MessagePackConverter(typeof(MyTypeConverter))]
@@ -31,7 +31,7 @@ public class MyTypeConverter : MessagePackConverter<MyType>
 	public async Task MissingPublicDefaultCtor()
 	{
 		string source = /* lang=c#-test */ """
-			using TypeShape;
+			using PolyType;
 			using Nerdbank.MessagePack;
 
 			[MessagePackConverter({|NBMsgPack021:typeof(MyTypeConverter)|})]
@@ -54,7 +54,7 @@ private MyTypeConverter() { }
 	public async Task TypeDoesNotDeriveFromConverter()
 	{
 		string source = /* lang=c#-test */ """
-			using TypeShape;
+			using PolyType;
 			using Nerdbank.MessagePack;
 
 			[MessagePackConverter({|NBMsgPack020:typeof(MyTypeConverter)|})]
@@ -76,7 +76,7 @@ public class MyTypeConverter
 	public async Task TypeDoesNotDeriveFromConverterOfMatchingType()
 	{
 		string source = /* lang=c#-test */ """
-			using TypeShape;
+			using PolyType;
 			using Nerdbank.MessagePack;
 
 			[MessagePackConverter({|NBMsgPack020:typeof(IntConverter)|})]

diff --git a/test/Nerdbank.MessagePack.Analyzers.Tests/Verifiers/ReferencesHelper.cs b/test/Nerdbank.MessagePack.Analyzers.Tests/Verifiers/ReferencesHelper.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Andrew Arnott. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using TypeShape;
+using PolyType;
 
 internal static class ReferencesHelper
 {

diff --git a/test/Nerdbank.MessagePack.Tests/Usings.cs b/test/Nerdbank.MessagePack.Tests/Usings.cs
@@ -5,7 +5,7 @@
 global using System.Collections.Immutable;
 global using Nerdbank.MessagePack;
 global using Nerdbank.Streams;
-global using TypeShape;
-global using TypeShape.Abstractions;
+global using PolyType;
+global using PolyType.Abstractions;
 global using Xunit;
 global using Xunit.Abstractions;