Skip to content

Commit

Permalink
Change target framework
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShortDevelopment
ShortDevelopment committed May 13, 2023
1 parent b13fee1 commit eef8d68
Show file tree
Hide file tree
Showing 59 changed files with 78 additions and 369 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ different versioning scheme, following the Haskell community's

### C# ###

* Removed support for .Net-Framework v4.5 as it's out of support.
Target `v4.6.2`+ with `netstandard2.0` instead.
* Implicit codegen now excludes any .bond files in the project's output
directories (e.g., `bin/`, `obj/debug/netstandard1.0`). This behavior
matches the implicit compilation behavior for .cs files.
Expand Down
5 changes: 1 addition & 4 deletions appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
choco install haskell-stack -y
choco install dotnetcore-sdk -y
choco install dotnet-sdk -y
# choco install updated the path, so re-read them from the registry and reset $env:path
Expand Down Expand Up @@ -321,9 +321,6 @@
dotnet test cs\test\core\Core.csproj
if (-not $?) { throw "tests failed" }
dotnet test cs\test\coreNS10\CoreNS10.csproj
if (-not $?) { throw "tests failed" }
dotnet test cs\test\internal\Internal.csproj
if (-not $?) { throw "tests failed" }
Expand Down
2 changes: 1 addition & 1 deletion cmake/Config.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ if (WIN32)

# If C# has been built we will also run C# compatibility tests
find_program (BOND_CSHARP_COMPAT_TEST Bond.CompatibilityTest.exe
PATH_SUFFIXES net45
PATH_SUFFIXES netstandard2.0
NO_DEFAULT_PATH
PATHS
"${CMAKE_CURRENT_SOURCE_DIR}/cs/test/compat/core/bin/debug"
Expand Down
2 changes: 1 addition & 1 deletion cs/Compiler.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<_BondCmakeProgramPath Condition=" '$(STACK_PATH)' != '' ">"-DCMAKE_PROGRAM_PATH=$(STACK_PATH)\."</_BondCmakeProgramPath>
</PropertyGroup>

<Exec Command="cmake $(ProjectDir)\..\compiler $(_BondCmakeProgramPath) -Wno-dev" WorkingDirectory="$(IntermediateOutputPath)" />
<Exec Command="cmake &quot;$(ProjectDir)\..\compiler&quot; $(_BondCmakeProgramPath) -Wno-dev" WorkingDirectory="$(IntermediateOutputPath)" />
<Exec Command="cmake --build . --config $(BondCompilerCMakeBuildType) --target gbc" WorkingDirectory="$(IntermediateOutputPath)" />

<Copy SourceFiles="$(IntermediateOutputPath)\build\gbc\gbc.exe" DestinationFolder="$(ProjectDir)\tools\" />
Expand Down
7 changes: 4 additions & 3 deletions cs/build/internal/Common.Internal.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
</PropertyGroup>
<Import Project="..\nuget\Common.props" />
<PropertyGroup Condition="'$(BuildFramework)' == '' and '$(UsingMicrosoftNETSdk)' != 'true'">
<BuildFramework>net45</BuildFramework>
<BuildFramework>net462</BuildFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(UsingMicrosoftNETSdk)' != 'true'">
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<OutputPath>bin\$(BuildType)\$(BuildFramework)</OutputPath>
<IntermediateOutputPath>obj\$(BuildType)\$(BuildFramework)</IntermediateOutputPath>
<IntermediateOutputPath>obj\$(BuildType)\$(BuildFramework)\</IntermediateOutputPath>
<FileAlignment>512</FileAlignment>
<NoWarn>1591</NoWarn>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand All @@ -26,6 +26,7 @@
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)bond.snk</AssemblyOriginatorKeyFile>
<!-- We need to disable automatic AssemblyInfo generation to avoid duplication with our AssemblyInfo file -->
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup>
<!--Set the version number for auto-generation from the environment
Expand Down
3 changes: 3 additions & 0 deletions cs/build/nuget/Common.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,7 @@
<PropertyGroup Condition=" '$(EnableDefaultItems)' == 'true' ">
<DefaultItemExcludes>$(DefaultItemExcludes);**/*.bond</DefaultItemExcludes>
</PropertyGroup>
<PropertyGroup>
<AutoGenerateBindingRedirects Condition=" '$(AutoGenerateBindingRedirects)' == '' ">true</AutoGenerateBindingRedirects>
</PropertyGroup>
</Project>
28 changes: 1 addition & 27 deletions cs/cs.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,19 +235,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "schema_view", "..\examples\
{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89} = {92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreNS10", "test\coreNS10\CoreNS10.csproj", "{3805B86E-2BE3-4FFA-A11C-B4981069EC88}"
ProjectSection(ProjectDependencies) = postProject
{2E6E238C-9017-445C-9611-66DA780609BE} = {2E6E238C-9017-445C-9611-66DA780609BE}
{43CBBA9B-C4BC-4E64-8733-7B72562D2E91} = {43CBBA9B-C4BC-4E64-8733-7B72562D2E91}
{C001C79F-D289-4CF3-BB59-5F5A72F70D0E} = {C001C79F-D289-4CF3-BB59-5F5A72F70D0E}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "default-ignore-output", "test\codegen\default-ignore-output\default-ignore-output.csproj", "{98BF6B10-F821-4402-8923-5F7B726BBFC8}"
ProjectSection(ProjectDependencies) = postProject
{21E175D5-BBDD-4B63-8FB7-38899BF2F9D1} = {21E175D5-BBDD-4B63-8FB7-38899BF2F9D1}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "immutable_collections", "..\examples\cs\core\immutable_collections\immutable_collections.csproj", "{9CC2754E-501D-4DB3-8EAA-8B91025E5DF6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "immutable_collections", "..\examples\cs\core\immutable_collections\immutable_collections.csproj", "{9CC2754E-501D-4DB3-8EAA-8B91025E5DF6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -847,24 +840,6 @@ Global
{4FACD9A1-B8AC-4D76-B4B5-B71607EA8F8C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{4FACD9A1-B8AC-4D76-B4B5-B71607EA8F8C}.Release|Win32.ActiveCfg = Release|Any CPU
{4FACD9A1-B8AC-4D76-B4B5-B71607EA8F8C}.Release|Win32.Build.0 = Release|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Debug|Win32.ActiveCfg = Debug|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Debug|Win32.Build.0 = Debug|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Fields|Any CPU.ActiveCfg = Fields|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Fields|Any CPU.Build.0 = Fields|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Fields|Mixed Platforms.ActiveCfg = Fields|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Fields|Mixed Platforms.Build.0 = Fields|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Fields|Win32.ActiveCfg = Fields|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Fields|Win32.Build.0 = Fields|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Release|Any CPU.Build.0 = Release|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Release|Win32.ActiveCfg = Release|Any CPU
{3805B86E-2BE3-4FFA-A11C-B4981069EC88}.Release|Win32.Build.0 = Release|Any CPU
{98BF6B10-F821-4402-8923-5F7B726BBFC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{98BF6B10-F821-4402-8923-5F7B726BBFC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{98BF6B10-F821-4402-8923-5F7B726BBFC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -938,7 +913,6 @@ Global
{B3A51630-DECC-451F-ADE9-CE91BE66E00D} = {621A2166-EEE0-4A27-88AA-5BE5AC996452}
{A3D32461-E09E-4F96-96B6-3B58835365D8} = {621A2166-EEE0-4A27-88AA-5BE5AC996452}
{4FACD9A1-B8AC-4D76-B4B5-B71607EA8F8C} = {621A2166-EEE0-4A27-88AA-5BE5AC996452}
{3805B86E-2BE3-4FFA-A11C-B4981069EC88} = {4268A1D3-AF40-4120-B021-D95A0F754221}
{98BF6B10-F821-4402-8923-5F7B726BBFC8} = {8CF1F5CD-548F-4323-869E-AA5903C88B6A}
{9CC2754E-501D-4DB3-8EAA-8B91025E5DF6} = {621A2166-EEE0-4A27-88AA-5BE5AC996452}
EndGlobalSection
Expand Down
27 changes: 5 additions & 22 deletions cs/nuget/bond.compiler.csharp.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,29 +27,12 @@
files, but there doesn't seem to be a good way to reference
dependent packages from MSBuild targets. Instead, we duplicate the
files in this package. They're pretty small. -->
<file target="build\net45" src="cs\build\nuget\Bond.Compiler.CSharp.props" />
<file target="build\net45" src="cs\build\nuget\Bond.Compiler.CSharp.targets" />
<file target="build\net45" src="cs\build\nuget\Common.props" />
<file target="build\net45" src="cs\build\nuget\Common.targets" />
<file target="build\net45\cps" src="cs\build\nuget\cps\*.xaml" />

<file target="build\netstandard1.0" src="cs\build\nuget\Bond.Compiler.CSharp.props" />
<file target="build\netstandard1.0" src="cs\build\nuget\Bond.Compiler.CSharp.targets" />
<file target="build\netstandard1.0" src="cs\build\nuget\Common.props" />
<file target="build\netstandard1.0" src="cs\build\nuget\Common.targets" />
<file target="build\netstandard1.0\cps" src="cs\build\nuget\cps\*.xaml" />

<file target="build\netstandard1.3" src="cs\build\nuget\Bond.Compiler.CSharp.props" />
<file target="build\netstandard1.3" src="cs\build\nuget\Bond.Compiler.CSharp.targets" />
<file target="build\netstandard1.3" src="cs\build\nuget\Common.props" />
<file target="build\netstandard1.3" src="cs\build\nuget\Common.targets" />
<file target="build\netstandard1.3\cps" src="cs\build\nuget\cps\*.xaml" />

<file target="build\netstandard1.6" src="cs\build\nuget\Bond.Compiler.CSharp.props" />
<file target="build\netstandard1.6" src="cs\build\nuget\Bond.Compiler.CSharp.targets" />
<file target="build\netstandard1.6" src="cs\build\nuget\Common.props" />
<file target="build\netstandard1.6" src="cs\build\nuget\Common.targets" />
<file target="build\netstandard1.6\cps" src="cs\build\nuget\cps\*.xaml" />
<file target="build\netstandard2.0" src="cs\build\nuget\Bond.Compiler.CSharp.props" />
<file target="build\netstandard2.0" src="cs\build\nuget\Bond.Compiler.CSharp.targets" />
<file target="build\netstandard2.0" src="cs\build\nuget\Common.props" />
<file target="build\netstandard2.0" src="cs\build\nuget\Common.targets" />
<file target="build\netstandard2.0\cps" src="cs\build\nuget\cps\*.xaml" />

<file target="images\" src="doc\src\logos\bond-logo-64x64-transparent.png" />

Expand Down
73 changes: 12 additions & 61 deletions cs/nuget/bond.core.csharp.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,66 +27,17 @@
<files>
<file target="images\" src="doc\src\logos\bond-logo-64x64-transparent.png" />

<file target="lib\net45" src="cs\bin\retail\net45\Bond.Attributes.dll" />
<file target="lib\net45" src="cs\bin\retail\net45\Bond.Attributes.pdb" />
<file target="lib\net45" src="cs\bin\retail\net45\Bond.Attributes.xml" />
<file target="lib\net45" src="cs\bin\retail\net45\Bond.IO.dll" />
<file target="lib\net45" src="cs\bin\retail\net45\Bond.IO.pdb" />
<file target="lib\net45" src="cs\bin\retail\net45\Bond.IO.xml" />
<file target="lib\net45" src="cs\bin\retail\net45\Bond.Reflection.dll" />
<file target="lib\net45" src="cs\bin\retail\net45\Bond.Reflection.pdb" />
<file target="lib\net45" src="cs\bin\retail\net45\Bond.Reflection.xml" />
<file target="lib\net45" src="cs\bin\retail\net45\Bond.dll" />
<file target="lib\net45" src="cs\bin\retail\net45\Bond.pdb" />
<file target="lib\net45" src="cs\bin\retail\net45\Bond.xml" />

<file target="lib\net46" src="cs\bin\retail\net45\Bond.Attributes.dll" />
<file target="lib\net46" src="cs\bin\retail\net45\Bond.Attributes.pdb" />
<file target="lib\net46" src="cs\bin\retail\net45\Bond.Attributes.xml" />
<file target="lib\net46" src="cs\bin\retail\net46\Bond.IO.dll" />
<file target="lib\net46" src="cs\bin\retail\net46\Bond.IO.pdb" />
<file target="lib\net46" src="cs\bin\retail\net46\Bond.IO.xml" />
<file target="lib\net46" src="cs\bin\retail\net45\Bond.Reflection.dll" />
<file target="lib\net46" src="cs\bin\retail\net45\Bond.Reflection.pdb" />
<file target="lib\net46" src="cs\bin\retail\net45\Bond.Reflection.xml" />
<file target="lib\net46" src="cs\bin\retail\net45\Bond.dll" />
<file target="lib\net46" src="cs\bin\retail\net45\Bond.pdb" />
<file target="lib\net46" src="cs\bin\retail\net45\Bond.xml" />

<file target="lib\netstandard1.0" src="cs\bin\retail\netstandard1.0\Bond.Attributes.dll" />
<file target="lib\netstandard1.0" src="cs\bin\retail\netstandard1.0\Bond.Attributes.pdb" />
<file target="lib\netstandard1.0" src="cs\bin\retail\netstandard1.0\Bond.Attributes.xml" />
<file target="lib\netstandard1.0" src="cs\bin\retail\netstandard1.0\Bond.Reflection.dll" />
<file target="lib\netstandard1.0" src="cs\bin\retail\netstandard1.0\Bond.Reflection.pdb" />
<file target="lib\netstandard1.0" src="cs\bin\retail\netstandard1.0\Bond.Reflection.xml" />
<file target="lib\netstandard1.0" src="cs\bin\retail\netstandard1.0\Bond.dll" />
<file target="lib\netstandard1.0" src="cs\bin\retail\netstandard1.0\Bond.pdb" />
<file target="lib\netstandard1.0" src="cs\bin\retail\netstandard1.0\Bond.xml" />

<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.0\Bond.Attributes.dll" />
<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.0\Bond.Attributes.pdb" />
<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.0\Bond.Attributes.xml" />
<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.0\Bond.Reflection.dll" />
<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.0\Bond.Reflection.pdb" />
<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.0\Bond.Reflection.xml" />
<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.0\Bond.dll" />
<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.0\Bond.pdb" />
<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.0\Bond.xml" />
<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.3\Bond.IO.dll" />
<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.3\Bond.IO.pdb" />
<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.3\Bond.IO.xml" />

<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.Attributes.dll" />
<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.Attributes.pdb" />
<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.Attributes.xml" />
<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.IO.dll" />
<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.IO.pdb" />
<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.IO.xml" />
<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.Reflection.dll" />
<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.Reflection.pdb" />
<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.Reflection.xml" />
<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.dll" />
<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.pdb" />
<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.xml" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.Attributes.dll" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.Attributes.pdb" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.Attributes.xml" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.Reflection.dll" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.Reflection.pdb" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.Reflection.xml" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.dll" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.pdb" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.xml" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.IO.dll" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.IO.pdb" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.IO.xml" />
</files>
</package>
2 changes: 1 addition & 1 deletion cs/nuget/bond.csharp.test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Test</RootNamespace>
<AssemblyName>Bond.NuGetTest</AssemblyName>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net462</TargetFramework>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\build\internal\bond.snk</AssemblyOriginatorKeyFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Expand Down
18 changes: 3 additions & 15 deletions cs/nuget/bond.runtime.csharp.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,8 @@
<files>
<file target="images\" src="doc\src\logos\bond-logo-64x64-transparent.png" />

<file target="lib\net45" src="cs\bin\retail\net45\Bond.JSON.dll" />
<file target="lib\net45" src="cs\bin\retail\net45\Bond.JSON.pdb" />
<file target="lib\net45" src="cs\bin\retail\net45\Bond.JSON.xml" />

<file target="lib\netstandard1.0" src="cs\bin\retail\netstandard1.0\Bond.JSON.dll" />
<file target="lib\netstandard1.0" src="cs\bin\retail\netstandard1.0\Bond.JSON.pdb" />
<file target="lib\netstandard1.0" src="cs\bin\retail\netstandard1.0\Bond.JSON.xml" />

<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.0\Bond.JSON.dll" />
<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.0\Bond.JSON.pdb" />
<file target="lib\netstandard1.3" src="cs\bin\retail\netstandard1.0\Bond.JSON.xml" />

<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.JSON.dll" />
<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.JSON.pdb" />
<file target="lib\netstandard1.6" src="cs\bin\retail\netstandard1.6\Bond.JSON.xml" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.JSON.dll" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.JSON.pdb" />
<file target="lib\netstandard2.0" src="cs\bin\retail\netstandard2.0\Bond.JSON.xml" />
</files>
</package>
2 changes: 1 addition & 1 deletion cs/src/attributes/Attributes.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup>
<ProjectGuid>{92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89}</ProjectGuid>
<TargetFrameworks>net45;netstandard1.0;netstandard1.6</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<Configurations>Debug;Release</Configurations>
<RootNamespace>Bond</RootNamespace>
<AssemblyName>Bond.Attributes</AssemblyName>
Expand Down
6 changes: 1 addition & 5 deletions cs/src/core/Bond.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,11 @@

<PropertyGroup>
<ProjectGuid>{43CBBA9B-C4BC-4E64-8733-7B72562D2E91}</ProjectGuid>
<TargetFrameworks>net45;netstandard1.0;netstandard1.6</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<Configurations>Debug;Release</Configurations>
<BondRedistributable>true</BondRedistributable>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
<DefineConstants>$(DefineConstants);SUPPORTS_XMLRESOLVER</DefineConstants>
</PropertyGroup>

<PropertyGroup>
<BOND_INCLUDE_PATH Condition="'$(BOND_INCLUDE_PATH)' == ''">$(MSBuildThisFileDirectory)..\..\..\idl</BOND_INCLUDE_PATH>
</PropertyGroup>
Expand Down
Loading

0 comments on commit eef8d68

Please sign in to comment.