Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup structure #1734

Draft
wants to merge 15 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 0 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ Alternatively you may build from the command line using `msbuild.exe` or:

dotnet build /p:platform=NoVSIX

## Unity

Unity Project requires several dependency DLL's. At first, run `copy_assets.bat` under `src\MessagePack.UnityClient`.
Then open that directory in the Unity Editor.

## Where to find our CI feed

Once a change is in a shipping branch (e.g. `v1.8`, `v2.0`, `master`), our CI will build it and push the built package
Expand Down
3 changes: 3 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
<PackageVersion Include="xunit" Version="2.7.0" />
<PackageVersion Include="ZeroFormatter" Version="1.6.4" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
<PackageVersion Include="System.Collections.Immutable" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net472'">
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
<PackageVersion Include="System.CodeDom" Version="6.0.0" />
Expand Down
12 changes: 12 additions & 0 deletions bin/MessagePack/Debug/netstandard2.0/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "com.github.messagepack.internal",
"displayName": "MessagePack Internal",
"author": { "name": "MessagePack-CSharp", "url": "https://github.com/MessagePack-CSharp/MessagePack-CSharp" },
"version": "1.0.0",
"unity": "2021.3",
"description": "Internal Package of MessagePack for development time.",
"keywords": [ "Serialization" ],
"license": "MIT",
"category": "Scripting",
"dependencies": {}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 0 additions & 14 deletions prepare_release.ps1

This file was deleted.

90 changes: 45 additions & 45 deletions sandbox/DynamicCodeDumper/DynamicCodeDumper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,139 +7,139 @@
<DefineConstants>$(DefineConstants);DYNAMICCODEDUMPER</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Annotations\Attributes.cs">
<Compile Include="..\..\src\MessagePack.Annotations\Attributes.cs">
<Link>Code\Attributes.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\BufferWriter.cs">
<Compile Include="..\..\src\MessagePack\BufferWriter.cs">
<Link>Code\BufferWriter.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Formatters\IMessagePackFormatter`1.cs">
<Compile Include="..\..\src\MessagePack\Formatters\IMessagePackFormatter`1.cs">
<Link>Code\IMessagePackFormatter`1.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Formatters\NullableFormatter.cs">
<Compile Include="..\..\src\MessagePack\Formatters\NullableFormatter.cs">
<Link>Code\NullableFormatter.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Formatters\DateTimeFormatters.cs">
<Compile Include="..\..\src\MessagePack\Formatters\DateTimeFormatters.cs">
<Link>Code\DateTimeFormatters.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\IFormatterResolver.cs">
<Compile Include="..\..\src\MessagePack\IFormatterResolver.cs">
<Link>Code\IFormatterResolver.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Annotations\IMessagePackSerializationCallbackReceiver.cs">
<Compile Include="..\..\src\MessagePack.Annotations\IMessagePackSerializationCallbackReceiver.cs">
<Link>Code\IMessagePackSerializationCallbackReceiver.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\AutomataDictionary.cs">
<Compile Include="..\..\src\MessagePack\Internal\AutomataDictionary.cs">
<Link>Code\AutomataDictionary.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\AutomataKeyGen.cs">
<Compile Include="..\..\src\MessagePack\Internal\AutomataKeyGen.cs">
<Link>Code\AutomataKeyGen.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\ThreadsafeTypeKeyHashTable.cs">
<Compile Include="..\..\src\MessagePack\Internal\ThreadsafeTypeKeyHashTable.cs">
<Link>Code\ThreadsafeTypeKeyHashTable.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\ByteArrayStringHashTable.cs">
<Compile Include="..\..\src\MessagePack\Internal\ByteArrayStringHashTable.cs">
<Link>Code\ByteArrayStringHashTable.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\CodeGenHelpers.cs">
<Compile Include="..\..\src\MessagePack\Internal\CodeGenHelpers.cs">
<Link>Code\CodeGenHelpers.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\RuntimeTypeHandleEqualityComparer.cs">
<Compile Include="..\..\src\MessagePack\Internal\RuntimeTypeHandleEqualityComparer.cs">
<Link>Code\RuntimeTypeHandleEqualityComparer.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\DynamicAssembly.cs">
<Compile Include="..\..\src\MessagePack\Internal\DynamicAssembly.cs">
<Link>Code\DynamicAssembly.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\ExpressionUtility.cs">
<Compile Include="..\..\src\MessagePack\Internal\ExpressionUtility.cs">
<Link>Code\ExpressionUtility.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\FarmHash.cs">
<Compile Include="..\..\src\MessagePack\Internal\FarmHash.cs">
<Link>Code\FarmHash.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\ILGeneratorExtensions.cs">
<Compile Include="..\..\src\MessagePack\Internal\ILGeneratorExtensions.cs">
<Link>Code\ILGeneratorExtensions.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\ReflectionExtensions.cs">
<Compile Include="..\..\src\MessagePack\Internal\ReflectionExtensions.cs">
<Link>Code\ReflectionExtensions.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\T4\UnsafeMemory.cs">
<Compile Include="..\..\src\MessagePack\Internal\UnsafeMemory.cs">
<Link>Code\UnsafeMemory.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\UnsafeMemory.Low.cs">
<Compile Include="..\..\src\MessagePack\Internal\UnsafeMemory.Low.cs">
<Link>Code\UnsafeMemory.Low.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\ExtensionHeader.cs">
<Compile Include="..\..\src\MessagePack\ExtensionHeader.cs">
<Link>Code\ExtensionHeader.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\ExtensionResult.cs">
<Compile Include="..\..\src\MessagePack\ExtensionResult.cs">
<Link>Code\ExtensionResult.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackSerializerOptions.cs">
<Compile Include="..\..\src\MessagePack\MessagePackSerializerOptions.cs">
<Link>Code\MessagePackSerializerOptions.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackSecurity.cs">
<Compile Include="..\..\src\MessagePack\MessagePackSecurity.cs">
<Link>Code\MessagePackSecurity.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MonoProtection.cs">
<Compile Include="..\..\src\MessagePack\MonoProtection.cs">
<Link>Code\MonoProtection.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\HashCode.cs">
<Compile Include="..\..\src\MessagePack\HashCode.cs">
<Link>Code\HashCode.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\BitOperations.cs">
<Compile Include="..\..\src\MessagePack\BitOperations.cs">
<Link>Code\BitOperations.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackCompression.cs">
<Compile Include="..\..\src\MessagePack\MessagePackCompression.cs">
<Link>Code\MessagePackCompression.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackReader.cs">
<Compile Include="..\..\src\MessagePack\MessagePackReader.cs">
<Link>Code\MessagePackReader.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\T4\MessagePackReader.Integers.cs">
<Compile Include="..\..\src\MessagePack\MessagePackReader.Integers.cs">
<Link>Code\MessagePackReader.Integers.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackWriter.cs">
<Compile Include="..\..\src\MessagePack\MessagePackWriter.cs">
<Link>Code\MessagePackWriter.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\SequencePool.cs">
<Compile Include="..\..\src\MessagePack\SequencePool.cs">
<Link>Code\SequencePool.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\SequenceReader.cs">
<Compile Include="..\..\src\MessagePack\SequenceReader.cs">
<Link>Code\SequenceReader.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\SequenceReaderExtensions.cs">
<Compile Include="..\..\src\MessagePack\SequenceReaderExtensions.cs">
<Link>Code\SequenceReaderExtensions.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\SafeBitConverter.cs">
<Compile Include="..\..\src\MessagePack\SafeBitConverter.cs">
<Link>Code\SafeBitConverter.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackCode.cs">
<Compile Include="..\..\src\MessagePack\MessagePackCode.cs">
<Link>Code\MessagePackCode.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackSerializationException.cs">
<Compile Include="..\..\src\MessagePack\MessagePackSerializationException.cs">
<Link>Code\MessagePackSerializationException.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\DateTimeConstants.cs">
<Compile Include="..\..\src\MessagePack\Internal\DateTimeConstants.cs">
<Link>Code\Internal\DateTimeConstants.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Nil.cs">
<Compile Include="..\..\src\MessagePack\Nil.cs">
<Link>Code\Nil.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Utilities.cs">
<Compile Include="..\..\src\MessagePack\Utilities.cs">
<Link>Code\Utilities.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Resolvers\DynamicEnumResolver.cs">
<Compile Include="..\..\src\MessagePack\Resolvers\DynamicEnumResolver.cs">
<Link>Code\DynamicEnumResolver.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Resolvers\DynamicObjectResolver.cs">
<Compile Include="..\..\src\MessagePack\Resolvers\DynamicObjectResolver.cs">
<Link>Code\DynamicObjectResolver.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Resolvers\DynamicUnionResolver.cs">
<Compile Include="..\..\src\MessagePack\Resolvers\DynamicUnionResolver.cs">
<Link>Code\DynamicUnionResolver.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Resolvers\ResolverUtilities.cs">
<Compile Include="..\..\src\MessagePack\Resolvers\ResolverUtilities.cs">
<Link>Code\ResolverUtilities.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\StringEncoding.cs">
<Compile Include="..\..\src\MessagePack\StringEncoding.cs">
<Link>Code\StringEncoding.cs</Link>
</Compile>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\Tests\Class1.cs">
Expand Down
35 changes: 18 additions & 17 deletions sandbox/MessagePack.Internal/MessagePack.Internal.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,24 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\BufferWriter.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\ExtensionHeader.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\ExtensionResult.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackCode.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackReader.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackSerializationException.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\T4\MessagePackReader.Integers.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackWriter.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Nil.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\Sequence`1.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\SequencePool.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\SequenceReader.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\SequenceReaderExtensions.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\StringEncoding.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\DateTimeConstants.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\GuidBits.cs" />
<Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Utilities.cs" Link="Utilities.cs" />
<Compile Include="..\..\src\MessagePack\BufferWriter.cs" />
<Compile Include="..\..\src\MessagePack\ExtensionHeader.cs" />
<Compile Include="..\..\src\MessagePack\ExtensionResult.cs" />
<Compile Include="..\..\src\MessagePack\MessagePackCode.cs" />
<Compile Include="..\..\src\MessagePack\MessagePackReader.cs" />
<Compile Include="..\..\src\MessagePack\MessagePackSerializationException.cs" />
<Compile Include="..\..\src\MessagePack\MessagePackReader.Integers.cs" />
<Compile Include="..\..\src\MessagePack\MessagePackWriter.cs" />
<Compile Include="..\..\src\MessagePack\Nil.cs" />
<Compile Include="..\..\src\MessagePack\Internal\Sequence`1.cs" />
<Compile Include="..\..\src\MessagePack\SafeBitConverter.cs" />
<Compile Include="..\..\src\MessagePack\SequencePool.cs" />
<Compile Include="..\..\src\MessagePack\SequenceReader.cs" />
<Compile Include="..\..\src\MessagePack\SequenceReaderExtensions.cs" />
<Compile Include="..\..\src\MessagePack\StringEncoding.cs" />
<Compile Include="..\..\src\MessagePack\Internal\DateTimeConstants.cs" />
<Compile Include="..\..\src\MessagePack\Internal\GuidBits.cs" />
<Compile Include="..\..\src\MessagePack\Utilities.cs" Link="Utilities.cs" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions sandbox/SharedData/SharedData.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyOriginatorKeyFile>..\..\opensource.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) All contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

[assembly: DefaultDllImportSearchPaths(DllImportSearchPath.SafeDirectories)]
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public class SerializationConstructorAttribute : Attribute
{
}

[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface | AttributeTargets.Enum | AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Parameter | AttributeTargets.ReturnValue, AllowMultiple = false, Inherited = true)]
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface | AttributeTargets.Enum | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
public class MessagePackFormatterAttribute : Attribute
{
public Type FormatterType { get; private set; }
Expand Down
4 changes: 0 additions & 4 deletions src/MessagePack.Annotations/MessagePack.Annotations.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,4 @@
<PackageTags>MsgPack;MessagePack;Serialization;Formatter;Serializer;Unity;Xamarin</PackageTags>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\MessagePack.UnityClient\Assets\Scripts\MessagePack\Annotations\**\*.cs" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<IsAnalyzerProject>true</IsAnalyzerProject>
<AnalyzerLanguage>cs</AnalyzerLanguage>
<DebugType>embedded</DebugType>
Expand All @@ -14,16 +15,16 @@
<None Remove="AnalyzerReleases.Shipped.md" />
<None Remove="AnalyzerReleases.Unshipped.md" />
</ItemGroup>

<ItemGroup>
<AdditionalFiles Include="AnalyzerReleases.Shipped.md" />
<AdditionalFiles Include="AnalyzerReleases.Unshipped.md" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\AutomataKeyGen.cs" LinkBase="MessagePack\Internal" />
<Compile Include="..\MessagePack.UnityClient\Assets\Scripts\MessagePack\SafeBitConverter.cs" LinkBase="MessagePack" />
<Compile Include="..\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackSerializationException.cs" LinkBase="MessagePack" />
<Compile Include="..\MessagePack\Internal\AutomataKeyGen.cs" LinkBase="MessagePack\Internal" />
<Compile Include="..\MessagePack\SafeBitConverter.cs" LinkBase="MessagePack" />
<Compile Include="..\MessagePack\MessagePackSerializationException.cs" LinkBase="MessagePack" />
<Compile Update="Transforms\CompositeResolverTemplate.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.