diff options
author | pCYSl5EDgo <31692496+pCYSl5EDgo@users.noreply.github.com> | 2021-12-25 07:58:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-25 07:58:25 +0300 |
commit | fed033dd7b75c036ff598ac608255c22ae8b708f (patch) | |
tree | 8d333a3edd4bb4fa03917a2d43359ca007ee8dae /src | |
parent | 0dc9c785e74b50e8b3217988239ed3bf5c0b4e6a (diff) |
.NET 6 Update (#1355)
* Update versions of MPC dependencies
* Add net6.0 target
Co-authored-by: Andrew Arnott <andrewarnott@live.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/MessagePack.Generator/MessagePack.Generator.csproj | 8 | ||||
-rw-r--r-- | src/MessagePack.GeneratorCore/Generator/EnumTemplate.cs | 8 | ||||
-rw-r--r-- | src/MessagePack.GeneratorCore/MessagePack.GeneratorCore.csproj | 5 | ||||
-rw-r--r-- | src/MessagePack/MessagePack.csproj | 14 | ||||
-rw-r--r-- | src/MessagePack/net6.0/PublicAPI.Shipped.txt (renamed from src/MessagePack/netcoreapp2.1/PublicAPI.Shipped.txt) | 2 | ||||
-rw-r--r-- | src/MessagePack/net6.0/PublicAPI.Unshipped.txt (renamed from src/MessagePack/netcoreapp2.1/PublicAPI.Unshipped.txt) | 6 |
6 files changed, 24 insertions, 19 deletions
diff --git a/src/MessagePack.Generator/MessagePack.Generator.csproj b/src/MessagePack.Generator/MessagePack.Generator.csproj index b684a5b8..be7a1027 100644 --- a/src/MessagePack.Generator/MessagePack.Generator.csproj +++ b/src/MessagePack.Generator/MessagePack.Generator.csproj @@ -3,8 +3,8 @@ <PropertyGroup> <AssemblyName>mpc</AssemblyName> <OutputType>Exe</OutputType> - <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks> - <LangVersion>9</LangVersion> + <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks> + <LangVersion>10</LangVersion> <Nullable>enable</Nullable> <IsPackable>true</IsPackable> <PackAsTool>true</PackAsTool> @@ -18,11 +18,11 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="ConsoleAppFramework" Version="2.0.0" /> + <PackageReference Include="ConsoleAppFramework" Version="3.3.2" /> <PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" /> <PackageReference Include="Microsoft.Build.Framework" Version="16.5.0" ExcludeAssets="runtime" /> <PackageReference Include="Microsoft.Build" Version="16.5.0" ExcludeAssets="runtime" /> - <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.10.0" /> + <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.0.1" /> </ItemGroup> <ItemGroup> diff --git a/src/MessagePack.GeneratorCore/Generator/EnumTemplate.cs b/src/MessagePack.GeneratorCore/Generator/EnumTemplate.cs index b64b4912..814a3123 100644 --- a/src/MessagePack.GeneratorCore/Generator/EnumTemplate.cs +++ b/src/MessagePack.GeneratorCore/Generator/EnumTemplate.cs @@ -1,10 +1,10 @@ // ------------------------------------------------------------------------------ // <auto-generated> -// このコードはツールによって生成されました。 -// ランタイム バージョン: 16.0.0.0 +// This code was generated by a tool. +// Runtime Version: 16.0.0.0 // -// このファイルへの変更は、正しくない動作の原因になる可能性があり、 -// コードが再生成されると失われます。 +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // </auto-generated> // ------------------------------------------------------------------------------ namespace MessagePackCompiler.Generator diff --git a/src/MessagePack.GeneratorCore/MessagePack.GeneratorCore.csproj b/src/MessagePack.GeneratorCore/MessagePack.GeneratorCore.csproj index 526615e5..df4755e2 100644 --- a/src/MessagePack.GeneratorCore/MessagePack.GeneratorCore.csproj +++ b/src/MessagePack.GeneratorCore/MessagePack.GeneratorCore.csproj @@ -11,9 +11,8 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.10.0" /> - <PackageReference Include="Microsoft.Build" Version="15.9.20" /> - <PackageReference Include="System.CodeDom" Version="4.7.0" /> + <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" /> + <PackageReference Include="System.CodeDom" Version="6.0.0" /> </ItemGroup> <ItemGroup> diff --git a/src/MessagePack/MessagePack.csproj b/src/MessagePack/MessagePack.csproj index c7c5090f..cb24047a 100644 --- a/src/MessagePack/MessagePack.csproj +++ b/src/MessagePack/MessagePack.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks> <NoWarn>$(NoWarn);CS0649</NoWarn> <AllowUnsafeBlocks>True</AllowUnsafeBlocks> <DefineConstants Condition=" '$(TargetFramework)' != 'netstandard2.0' ">$(DefineConstants);SPAN_BUILTIN</DefineConstants> @@ -33,15 +33,15 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.2" PrivateAssets="all" /> + <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.3" PrivateAssets="all" /> <PackageReference Include="Microsoft.NET.StringTools" Version="1.0.0" /> </ItemGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> - <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" /> - <PackageReference Include="System.Collections.Immutable" Version="1.5.0" /> - <PackageReference Include="System.Reflection.Emit" Version="4.6.0" /> - <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.6.0" /> - <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" /> + <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" /> + <PackageReference Include="System.Collections.Immutable" Version="1.7.1" /> + <PackageReference Include="System.Reflection.Emit" Version="4.7.0" /> + <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" /> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" /> </ItemGroup> <ItemGroup> diff --git a/src/MessagePack/netcoreapp2.1/PublicAPI.Shipped.txt b/src/MessagePack/net6.0/PublicAPI.Shipped.txt index 8aabf5dc..71c4d87b 100644 --- a/src/MessagePack/netcoreapp2.1/PublicAPI.Shipped.txt +++ b/src/MessagePack/net6.0/PublicAPI.Shipped.txt @@ -1,4 +1,4 @@ -MessagePack.ExtensionHeader +MessagePack.ExtensionHeader MessagePack.ExtensionHeader.ExtensionHeader(sbyte typeCode, int length) -> void MessagePack.ExtensionHeader.ExtensionHeader(sbyte typeCode, uint length) -> void MessagePack.ExtensionHeader.Length.get -> uint diff --git a/src/MessagePack/netcoreapp2.1/PublicAPI.Unshipped.txt b/src/MessagePack/net6.0/PublicAPI.Unshipped.txt index b44f24ad..4d82b979 100644 --- a/src/MessagePack/netcoreapp2.1/PublicAPI.Unshipped.txt +++ b/src/MessagePack/net6.0/PublicAPI.Unshipped.txt @@ -1,6 +1,11 @@ MessagePack.ExtensionHeader.ExtensionHeader() -> void MessagePack.ExtensionResult.ExtensionResult() -> void MessagePack.FormatterNotRegisteredException.FormatterNotRegisteredException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) -> void +MessagePack.Formatters.HalfFormatter +MessagePack.Formatters.HalfFormatter.Deserialize(ref MessagePack.MessagePackReader reader, MessagePack.MessagePackSerializerOptions options) -> System.Half +MessagePack.Formatters.HalfFormatter.Serialize(ref MessagePack.MessagePackWriter writer, System.Half value, MessagePack.MessagePackSerializerOptions options) -> void +MessagePack.Formatters.InterfaceReadOnlySetFormatter<T> +MessagePack.Formatters.InterfaceReadOnlySetFormatter<T>.InterfaceReadOnlySetFormatter() -> void MessagePack.Formatters.StringInterningFormatter MessagePack.Formatters.StringInterningFormatter.Deserialize(ref MessagePack.MessagePackReader reader, MessagePack.MessagePackSerializerOptions options) -> string MessagePack.Formatters.StringInterningFormatter.Serialize(ref MessagePack.MessagePackWriter writer, string value, MessagePack.MessagePackSerializerOptions options) -> void @@ -17,6 +22,7 @@ MessagePack.SequencePool.SequencePool(int maxSize, System.Buffers.ArrayPool<byte MessagePack.TinyJsonException.TinyJsonException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) -> void static MessagePack.Nil.operator !=(MessagePack.Nil left, MessagePack.Nil right) -> bool static MessagePack.Nil.operator ==(MessagePack.Nil left, MessagePack.Nil right) -> bool +static readonly MessagePack.Formatters.HalfFormatter.Instance -> MessagePack.Formatters.IMessagePackFormatter<System.Half> virtual MessagePack.MessagePackStreamReader.Dispose(bool disposing) -> void MessagePack.Formatters.GenericEnumerableFormatter<TElement, TCollection> MessagePack.Formatters.GenericEnumerableFormatter<TElement, TCollection>.GenericEnumerableFormatter() -> void |