Skip to content

.NET Standard 2.0 #255

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.

Sign up for GitHub

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

Merged
merged 28 commits into from
Aug 30, 2017
Merged

.NET Standard 2.0 #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5604b9c
Set version to 1.0.0-beta1 for next release.
yfakariya Aug 13, 2017
904e83f
Add new sync projects tool.
yfakariya Aug 13, 2017
400f6a8
Cleanup source tree with new syncproject tool.
yfakariya Aug 13, 2017
ab1003f
Delete old SyncProjects tool.
yfakariya Aug 13, 2017
ab940aa
Update unittest project structure to reduce maintenance,
yfakariya Aug 13, 2017
d825464
Fix typo.
yfakariya Aug 14, 2017
d1295d6
Update binding redirects for new nunit test.
yfakariya Aug 14, 2017
044d1bf
Consolidate project properties.
yfakariya Aug 14, 2017
5544f89
Replace own compile symbols with standard symbols.
yfakariya Aug 14, 2017
195f43c
Fix build error for netcoreapp1.0
yfakariya Aug 14, 2017
ab1e147
Fix version.
yfakariya Aug 15, 2017
5420d96
Update nuget.exe
yfakariya Aug 15, 2017
6c2661b
Update solution.
yfakariya Aug 15, 2017
d263637
Fix netcoreapp1.0 unit test setting.
yfakariya Aug 15, 2017
3cc123b
Fix nupkg version conflict.
yfakariya Aug 15, 2017
4c526b3
Fix binding redirect.
yfakariya Aug 15, 2017
9a68c19
Fix GenericExceptionTester does not check partial trust serialization.
yfakariya Aug 15, 2017
09b77e2
Fix glob
yfakariya Aug 15, 2017
3a992cc
Fix Xamarin build.
yfakariya Aug 15, 2017
138d911
Add netstandard2.0 drop and its unit tests.
yfakariya Aug 14, 2017
e2cac86
Fix CI script to support updated test structure and netcoreapp run.
yfakariya Aug 15, 2017
377c736
Fix code DOM dump failure.
yfakariya Aug 15, 2017
00202a3
Fix sequential statements are emitted strangely in .net standard 2.0 …
yfakariya Aug 15, 2017
e9ced45
Enable MessagePackString.Equals test for all platforms.
yfakariya Aug 15, 2017
1664de6
Reflect auto update targets files by IDE.
yfakariya Aug 15, 2017
9f2e165
Fix build errors and warnings in *.Windows.sln
yfakariya Aug 15, 2017
e96e869
Fix UWP project file.
yfakariya Aug 26, 2017
c160d4b
Fix build scripts.
yfakariya Aug 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file modified .nuget/NuGet.exe
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,3 +701,5 @@ Release 0.9.0 2017-8-26
* Fix enum serialization throws NullReferenceException in Unity. Issue #215.
* Fix MessagePackSerializer.Capability does not work correctly in Unity.
* Fix polymorphic serializer error in Unity.

Release 1.0.0-beta1 T.B.D.
Binary file added Directory.Build.props
View file
Open in desktop
Binary file not shown.
82 changes: 82 additions & 0 deletions MsgPack.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MsgPack</RootNamespace>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
<AssemblyOriginatorKeyFile>$(SolutionDir)\src\MsgPack.snk</AssemblyOriginatorKeyFile>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<DebugType>portable</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>$(DefineConstants);DEBUG;SKIP_LARGE_TEST</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Instrument'">
<OutputPath>bin\Instrument\</OutputPath>
<Optimize>true</Optimize>
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CodeAnalysis|AnyCPU'">
<OutputPath>bin\CodeAnalysis\</OutputPath>
<Optimize>true</Optimize>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10'">
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net35'">
<DefineConstants>$(DefineConstants);FEATURE_POINTER_CONVERSION</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netcoreapp1.0'">
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.0'">
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10'">
<DefineConstants>$(DefineConstants);__MOBILE__;AOT;XAMARIN;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10'">
<DefineConstants>$(DefineConstants);__ANDROID__</DefineConstants>
<TargetFrameworkRootPath Condition="'$(VsInstallRoot)' != ''">$(VsInstallRoot)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\</TargetFrameworkRootPath>
<ImplicitlyExpandDesignTimeFacades>true</ImplicitlyExpandDesignTimeFacades>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'Xamarin.iOS10'">
<DefineConstants>$(DefineConstants);__IOS__</DefineConstants>
<TargetFrameworkRootPath Condition="'$(VsInstallRoot)' != ''">$(VsInstallRoot)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\</TargetFrameworkRootPath>
<ImplicitlyExpandDesignTimeFacades>true</ImplicitlyExpandDesignTimeFacades>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
<DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT</DefineConstants>
</PropertyGroup>
</Project>
Loading