diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ddacccead..40e5b2ee87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/appveyor.yml b/appveyor.yml index fb665dc163..819a7b03cd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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 @@ -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" } diff --git a/cmake/Config.cmake b/cmake/Config.cmake index 3f284974ab..cd68f26d12 100644 --- a/cmake/Config.cmake +++ b/cmake/Config.cmake @@ -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" diff --git a/cs/Compiler.csproj b/cs/Compiler.csproj index 0491eb7342..a4add07b35 100644 --- a/cs/Compiler.csproj +++ b/cs/Compiler.csproj @@ -86,7 +86,7 @@ <_BondCmakeProgramPath Condition=" '$(STACK_PATH)' != '' ">"-DCMAKE_PROGRAM_PATH=$(STACK_PATH)\." - + diff --git a/cs/build/internal/Common.Internal.props b/cs/build/internal/Common.Internal.props index 03f8002022..662f66d1ec 100644 --- a/cs/build/internal/Common.Internal.props +++ b/cs/build/internal/Common.Internal.props @@ -10,14 +10,14 @@ - net45 + net462 - v4.5 + v4.6.2 bin\$(BuildType)\$(BuildFramework) - obj\$(BuildType)\$(BuildFramework) + obj\$(BuildType)\$(BuildFramework)\ 512 1591 true @@ -26,6 +26,7 @@ $(MSBuildThisFileDirectory)bond.snk false + true - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/cs/nuget/bond.core.csharp.nuspec b/cs/nuget/bond.core.csharp.nuspec index 3f5324f3e7..70351060e5 100644 --- a/cs/nuget/bond.core.csharp.nuspec +++ b/cs/nuget/bond.core.csharp.nuspec @@ -27,66 +27,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/cs/nuget/bond.csharp.test.csproj b/cs/nuget/bond.csharp.test.csproj index 29faf5329e..43d8654a0c 100644 --- a/cs/nuget/bond.csharp.test.csproj +++ b/cs/nuget/bond.csharp.test.csproj @@ -4,7 +4,7 @@ Library Test Bond.NuGetTest - net46 + net462 true ..\build\internal\bond.snk false @@ -28,6 +28,7 @@ + $(BondOptions) --using="Lazy=Lazy<{0}>" --using="OrderedSet=SortedSet<{0}>" --using="Decimal=decimal" --using="EnumString=Alias.EnumString<{0}>" --using="Array={0}[]" --using=ArrayBlob=byte[] --using="CustomList=UnitTest.Aliases.SomeCustomList<{0}>" diff --git a/cs/nuget/bond.runtime.csharp.nuspec b/cs/nuget/bond.runtime.csharp.nuspec index 6652cd8d76..5cb94a64b8 100644 --- a/cs/nuget/bond.runtime.csharp.nuspec +++ b/cs/nuget/bond.runtime.csharp.nuspec @@ -31,20 +31,8 @@ - - - - - - - - - - - - - - - + + + diff --git a/cs/src/attributes/Attributes.csproj b/cs/src/attributes/Attributes.csproj index 585bc06e8a..cb3369986c 100644 --- a/cs/src/attributes/Attributes.csproj +++ b/cs/src/attributes/Attributes.csproj @@ -3,7 +3,7 @@ {92915BD9-8AB1-4E4D-A2AC-95BBF4F82D89} - net45;netstandard1.0;netstandard1.6 + netstandard2.0 Debug;Release Bond Bond.Attributes diff --git a/cs/src/core/Bond.csproj b/cs/src/core/Bond.csproj index d63ae6e856..9439a1ecda 100644 --- a/cs/src/core/Bond.csproj +++ b/cs/src/core/Bond.csproj @@ -3,15 +3,11 @@ {43CBBA9B-C4BC-4E64-8733-7B72562D2E91} - net45;netstandard1.0;netstandard1.6 + netstandard2.0 Debug;Release true - - $(DefineConstants);SUPPORTS_XMLRESOLVER - - $(MSBuildThisFileDirectory)..\..\..\idl diff --git a/cs/src/core/properties/AssemblyInfo.cs b/cs/src/core/properties/AssemblyInfo.cs index a52a969882..3c68604b19 100644 --- a/cs/src/core/properties/AssemblyInfo.cs +++ b/cs/src/core/properties/AssemblyInfo.cs @@ -16,4 +16,3 @@ [assembly: InternalsVisibleTo("Bond.ExpressionsTest, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")] [assembly: InternalsVisibleTo("Bond.InternalTest, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")] [assembly: InternalsVisibleTo("Bond.UnitTest, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")] -[assembly: InternalsVisibleTo("Bond.UnitTestCoreNS10, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")] diff --git a/cs/src/core/protocols/SimpleXmlReader.cs b/cs/src/core/protocols/SimpleXmlReader.cs index 7efa909d31..485ba15d3f 100644 --- a/cs/src/core/protocols/SimpleXmlReader.cs +++ b/cs/src/core/protocols/SimpleXmlReader.cs @@ -25,10 +25,8 @@ public SimpleXmlReader(Stream stream) { IgnoreComments = true, IgnoreProcessingInstructions = true, -#if SUPPORTS_XMLRESOLVER // do not attempt to resolve any external resources XmlResolver = null, -#endif })) { } @@ -37,10 +35,8 @@ public SimpleXmlReader(TextReader textReader) { IgnoreComments = true, IgnoreProcessingInstructions = true, -#if SUPPORTS_XMLRESOLVER // do not attempt to resolve any external resources XmlResolver = null, -#endif })) { } diff --git a/cs/src/io/IO.csproj b/cs/src/io/IO.csproj index b17587bd42..fdcd72a11f 100644 --- a/cs/src/io/IO.csproj +++ b/cs/src/io/IO.csproj @@ -3,7 +3,7 @@ {2E6E238C-9017-445C-9611-66DA780609BE} - net45;net46;netstandard1.3;netstandard1.6 + netstandard2.0 Debug;Release Bond.IO Bond.IO diff --git a/cs/src/io/unsafe/InputPointer.cs b/cs/src/io/unsafe/InputPointer.cs index e568a836e6..0421ac9235 100644 --- a/cs/src/io/unsafe/InputPointer.cs +++ b/cs/src/io/unsafe/InputPointer.cs @@ -233,11 +233,7 @@ public string ReadString(Encoding encoding, int size) EndOfStream(size); } -#if !(NETSTANDARD1_3 || NETSTANDARD1_6) - string result = new string((sbyte*) buffer, position, size, encoding); -#else string result = encoding.GetString(buffer + position, size); -#endif position += size; return result; diff --git a/cs/src/io/unsafe/StreamCloning.cs b/cs/src/io/unsafe/StreamCloning.cs index 88d6df0f75..a0f49900e4 100644 --- a/cs/src/io/unsafe/StreamCloning.cs +++ b/cs/src/io/unsafe/StreamCloning.cs @@ -75,57 +75,11 @@ static class NativeMethods public const uint FILE_GENERIC_READ = 0x00120089; [DllImport("kernel32.dll", SetLastError = true)] -#if !(NETSTANDARD1_3 || NETSTANDARD1_6) - [SuppressUnmanagedCodeSecurity] -#endif public static extern SafeFileHandle ReOpenFile(SafeFileHandle hFile, uint access, FileShare mode, uint flags); } static class MemoryStreamCloner { -#if !(NET46 || NETSTANDARD1_3 || NETSTANDARD1_6) - delegate void GetOriginAndLength(MemoryStream stream, out int origin, out int length); - static readonly GetOriginAndLength getOriginAndLength; - - static MemoryStreamCloner() - { - // MemoryStream can be created from byte[] at non-zero origin offset which - // is not exposed via public APIs. - // TODO: handle the case when the method API is not available (e.g. copy buffer) - var internalGetOriginAndLength = typeof(MemoryStream).GetMethod( - "InternalGetOriginAndLength", BindingFlags.NonPublic | BindingFlags.Instance); - - var stream = Expression.Parameter(typeof(MemoryStream)); - var origin = Expression.Parameter(typeof(int).MakeByRefType()); - var length = Expression.Parameter(typeof(int).MakeByRefType()); - - //internal method InternalGetOriginAndLength exists in .NET - if (internalGetOriginAndLength != null) - { - getOriginAndLength = Expression.Lambda( - Expression.Call(stream, internalGetOriginAndLength, origin, length), stream, origin, length) - .Compile(); - } - else - { - //Mono uses 'initialIndex' and 'length' fields in memory stream to handle the data - //see ref: https://github.com/mono/mono/blob/989301647e7cdf93acb69aacabcbb2bb2884e041/mcs/class/corlib/System.IO/MemoryStream.cs#L122-L126 - var assign1 = Expression.Assign(origin, Expression.Field(stream, "initialIndex")); //origin = stream.initialIndex - var assign2 = Expression.Assign(length, Expression.Field(stream, "length")); //length = stream.length - - getOriginAndLength = Expression.Lambda( - Expression.Block(assign1, assign2), stream, origin, length) - .Compile(); - } - } - - internal static MemoryStream CloneMemoryStream(MemoryStream stream) - { - int origin, length; - getOriginAndLength(stream, out origin, out length); - return new MemoryStream(stream.GetBuffer(), origin, length - origin, false, true) { Position = stream.Position }; - } -#else // NET46 & NETSTANDARD implementation internal static MemoryStream CloneMemoryStream(MemoryStream stream) { ArraySegment buffer; @@ -137,7 +91,6 @@ internal static MemoryStream CloneMemoryStream(MemoryStream stream) return new MemoryStream(buffer.Array, buffer.Offset, buffer.Count, false, true) { Position = stream.Position }; } -#endif } } } diff --git a/cs/src/json/JSON.csproj b/cs/src/json/JSON.csproj index 7f651b08d8..4b6100260c 100644 --- a/cs/src/json/JSON.csproj +++ b/cs/src/json/JSON.csproj @@ -3,17 +3,13 @@ {C001C79F-D289-4CF3-BB59-5F5A72F70D0E} - net45;netstandard1.0;netstandard1.6 + netstandard2.0 Debug;Release Bond Bond.JSON true - - $(DefineConstants);SUPPORTS_BIGINTEGER - - diff --git a/cs/src/json/expressions/json/SimpleJsonParser.cs b/cs/src/json/expressions/json/SimpleJsonParser.cs index 78efbf1ec3..1fe73d8b7f 100644 --- a/cs/src/json/expressions/json/SimpleJsonParser.cs +++ b/cs/src/json/expressions/json/SimpleJsonParser.cs @@ -8,11 +8,7 @@ namespace Bond.Expressions.Json using System.Diagnostics; using System.Globalization; using System.Linq.Expressions; - -#if SUPPORTS_BIGINTEGER using System.Numerics; -#endif - using Bond.Expressions.Pull; using Bond.Protocols; @@ -133,7 +129,6 @@ public override Expression Scalar(Expression valueType, BondDataType expectedTyp Expression embeddedExpression = handler(convertedValue); -#if SUPPORTS_BIGINTEGER if (expectedType == BondDataType.BT_UINT64 && scalarTokenType == JsonToken.Integer) { embeddedExpression = @@ -142,7 +137,6 @@ public override Expression Scalar(Expression valueType, BondDataType expectedTyp embeddedExpression, handler(Expression.Convert(Reader.Value, typeof(BigInteger)))); } -#endif var handleValue = Expression.IfThenElse( diff --git a/cs/src/reflection/properties/AssemblyInfo.cs b/cs/src/reflection/properties/AssemblyInfo.cs index d4db759e3a..de1c07148c 100644 --- a/cs/src/reflection/properties/AssemblyInfo.cs +++ b/cs/src/reflection/properties/AssemblyInfo.cs @@ -18,4 +18,3 @@ [assembly: InternalsVisibleTo("Bond.JSON, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")] [assembly: InternalsVisibleTo("Bond.NuGetTest, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")] [assembly: InternalsVisibleTo("Bond.UnitTest, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")] -[assembly: InternalsVisibleTo("Bond.UnitTestCoreNS10, PublicKey=00240000048000009400000006020000002400005253413100040000010001000d504ac18b4b149d2f7b0059b482f9b6d44d39059e6a96ff0a2a52678b5cfd8567cc67254132cd2debb5b95f6a1206a15c6f8ddac137c6c3ef4995f28c359acaa683a90995c8f08df7ce0aaa8836d331a344a514c443f112f80bf2ebed40ccb32d7df63c09b0d7bef80aecdc23ec200a458d4f8bafbcdeb9bf5ba111fbbd4787")] diff --git a/cs/src/reflection/reflection.csproj b/cs/src/reflection/reflection.csproj index 2f9e3b5086..382c888bb9 100644 --- a/cs/src/reflection/reflection.csproj +++ b/cs/src/reflection/reflection.csproj @@ -3,7 +3,7 @@ {40452223-3a34-4841-9a69-e0b6640b4108} - net45;netstandard1.0;netstandard1.6 + netstandard2.0 Debug;Release Bond.Reflection Bond.Reflection diff --git a/cs/test/codegen/default-ignore-output/default-ignore-output.csproj b/cs/test/codegen/default-ignore-output/default-ignore-output.csproj index 3f724204c6..e086efdfc6 100644 --- a/cs/test/codegen/default-ignore-output/default-ignore-output.csproj +++ b/cs/test/codegen/default-ignore-output/default-ignore-output.csproj @@ -4,7 +4,7 @@ Debug;Release Library 98BF6B10-F821-4402-8923-5F7B726BBFC8 - netstandard1.0 + netstandard2.0 diff --git a/cs/test/codegen/no-warnings/no-warnings.csproj b/cs/test/codegen/no-warnings/no-warnings.csproj index 6a81eeafae..5c2b7c4933 100644 --- a/cs/test/codegen/no-warnings/no-warnings.csproj +++ b/cs/test/codegen/no-warnings/no-warnings.csproj @@ -1,8 +1,5 @@  - - net45 - @@ -15,6 +12,7 @@ False UnitTest $(OutputPath) + net462 true diff --git a/cs/test/codegen/output-no-slash/output-no-slash.csproj b/cs/test/codegen/output-no-slash/output-no-slash.csproj index a97693b180..33f9e0737f 100644 --- a/cs/test/codegen/output-no-slash/output-no-slash.csproj +++ b/cs/test/codegen/output-no-slash/output-no-slash.csproj @@ -1,8 +1,5 @@ - - net45 - diff --git a/cs/test/core/Core.csproj b/cs/test/core/Core.csproj index b4c5e33bd9..4ba4066987 100644 --- a/cs/test/core/Core.csproj +++ b/cs/test/core/Core.csproj @@ -2,7 +2,7 @@ {FF056B62-225A-47BC-B177-550FADDA4B41} - net45 + net462 Debug;Release;Fields Library Properties @@ -11,9 +11,6 @@ False UnitTest - - $(DefineConstants);SUPPORTS_BIGINTEGER;SUPPORTS_XMLRESOLVER - $(IntermediateOutputPath)\Properties\ $(OutputPath)\Properties\ diff --git a/cs/test/core/Util.cs b/cs/test/core/Util.cs index 3f37f56048..e362ac9356 100644 --- a/cs/test/core/Util.cs +++ b/cs/test/core/Util.cs @@ -991,11 +991,7 @@ public static void AllSerializeDeserialize(From from, bool noTranscodi return DeserializeTagged(reader); }); -#if SUPPORTS_BIGINTEGER const bool hasBigInteger = true; -#else - const bool hasBigInteger = false; -#endif // Simple doesn't support omitting fields if (typeof(From) != typeof(Nothing) && typeof(From) != typeof(GenericsWithNothing)) diff --git a/cs/test/core/XmlParsingTests.cs b/cs/test/core/XmlParsingTests.cs index 4e543f1d16..b22ae508ad 100644 --- a/cs/test/core/XmlParsingTests.cs +++ b/cs/test/core/XmlParsingTests.cs @@ -16,13 +16,9 @@ public class XmlParsingTests new XmlReaderSettings { IgnoreProcessingInstructions = true, -#if !NETCOREAPP1_0 ValidationType = ValidationType.None, ValidationFlags = XmlSchemaValidationFlags.None, -#endif -#if SUPPORTS_XMLRESOLVER XmlResolver = null, -#endif }; [Test] diff --git a/cs/test/coreNS10/CoreNS10.csproj b/cs/test/coreNS10/CoreNS10.csproj deleted file mode 100644 index b30697a19d..0000000000 --- a/cs/test/coreNS10/CoreNS10.csproj +++ /dev/null @@ -1,77 +0,0 @@ - - - - net45 - Debug;Release;Fields - Library - Properties - UnitTest - Bond.UnitTestCoreNS10 - False - UnitTest - false - - netstandard1.0 - netstandard1.3 - - - $(IntermediateOutputPath)\Properties\ - $(OutputPath)\Properties\ - - - $(IntermediateOutputPath)\Fields\ - $(OutputPath)\Fields\ - --fields --collection-interfaces - - - - - - - - $(BondOptions) --using="Lazy=Lazy<{0}>" --using="OrderedSet=SortedSet<{0}>" --using="Decimal=decimal" --using="EnumString=Alias.EnumString<{0}>" --using="Array={0}[]" --using=ArrayBlob=byte[] --using="CustomList=UnitTest.Aliases.SomeCustomList<{0}>" - - - - - $(BondOptions) --readonly-properties - --readonly-properties --collection-interfaces - - - $(BondOptions) --collection-interfaces - --fields - - - $(BondOptions) --using="DateTime=System.DateTime" - - - $(BondOptions) --using="ImmutableArray=System.Collections.Immutable.ImmutableArray<{0}>" --using="ImmutableList=System.Collections.Immutable.ImmutableList<{0}>" --using="ImmutableHashSet=System.Collections.Immutable.ImmutableHashSet<{0}>" --using="ImmutableSortedSet=System.Collections.Immutable.ImmutableSortedSet<{0}>" --using="ImmutableDictionary=System.Collections.Immutable.ImmutableDictionary<{0},{1}>" --using="ImmutableSortedDictionary=System.Collections.Immutable.ImmutableSortedDictionary<{0},{1}>" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cs/test/coreNS10/Properties/AssemblyInfo.cs b/cs/test/coreNS10/Properties/AssemblyInfo.cs deleted file mode 100644 index 946c0b597c..0000000000 --- a/cs/test/coreNS10/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Bond.UnitTestCoreNS10")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Bond")] -[assembly: AssemblyCopyright("Copyright (C) Microsoft. All rights reserved.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8bed1071-4eba-429a-9628-e993ab5d8b3e")] diff --git a/cs/test/internal/Internal.csproj b/cs/test/internal/Internal.csproj index 634173625b..4803381558 100644 --- a/cs/test/internal/Internal.csproj +++ b/cs/test/internal/Internal.csproj @@ -8,7 +8,7 @@ Bond.InternalTest False UnitTest - net45 + net462 diff --git a/doc/src/bond_cs.md b/doc/src/bond_cs.md index 1e1377e035..918c482821 100644 --- a/doc/src/bond_cs.md +++ b/doc/src/bond_cs.md @@ -1697,13 +1697,13 @@ This table lists which frameworks are targeted by the Bond assemblies. This table is accurate for Bond NuGet packages 8.2.0 and later. -| Assembly | .NET 4.0 | .NET 4.5 | .NET 4.6 | .NET Standard 1.0 | .NET Standard 1.3 | .NET Standard 1.6 | -|--------------------------|----------|----------|----------|-------------------|-------------------|-------------------| -| Bond.Attributes.dll | No | Yes | ← | Yes | ← | Yes | -| Bond.Reflection.dll | No | Yes | ← | Yes | ← | Yes | -| Bond.dll | No | Yes | ← | Yes | ← | Yes | -| Bond.JSON.dll | No | Yes | ← | Yes | ← | Yes | -| Bond.IO.dll | No | Win only | Win only | No | Win only | Win only | +| Assembly | .NET Standard 2.0 | .NET 4.6.2 | +|--------------------------|-------------------|------------| +| Bond.Attributes.dll | Yes | ← | +| Bond.Reflection.dll | Yes | ← | +| Bond.dll | Yes | ← | +| Bond.JSON.dll | Yes | ← | +| Bond.IO.dll | Win only | Win only | A left arrow (←) indicates that support for that framework is provided by the version of the assembly that targets a lower version of the framework. diff --git a/examples/cs/core/blob/blob.csproj b/examples/cs/core/blob/blob.csproj index 7ddb8bb043..942ab8f7b4 100644 --- a/examples/cs/core/blob/blob.csproj +++ b/examples/cs/core/blob/blob.csproj @@ -7,7 +7,7 @@ Exe blob blob - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/cloning/cloning.csproj b/examples/cs/core/cloning/cloning.csproj index 279bb8d6b0..e0bc288397 100644 --- a/examples/cs/core/cloning/cloning.csproj +++ b/examples/cs/core/cloning/cloning.csproj @@ -7,7 +7,7 @@ Exe cloning cloning - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/container_alias/container_alias.csproj b/examples/cs/core/container_alias/container_alias.csproj index 8d7c5e2d6c..cb73d306a4 100644 --- a/examples/cs/core/container_alias/container_alias.csproj +++ b/examples/cs/core/container_alias/container_alias.csproj @@ -7,7 +7,7 @@ Exe container_alias container_alias - v4.5 + v4.6.2 --using="CustomList=Examples.SomeCustomList<{0}>" diff --git a/examples/cs/core/date_time/date_time.csproj b/examples/cs/core/date_time/date_time.csproj index 6300acb459..28494be346 100644 --- a/examples/cs/core/date_time/date_time.csproj +++ b/examples/cs/core/date_time/date_time.csproj @@ -7,7 +7,7 @@ Exe date_time date_time - v4.5 + v4.6.2 --using="DateTime=System.DateTime" diff --git a/examples/cs/core/decimal/decimal.csproj b/examples/cs/core/decimal/decimal.csproj index f6552cb039..984e110aa2 100644 --- a/examples/cs/core/decimal/decimal.csproj +++ b/examples/cs/core/decimal/decimal.csproj @@ -7,7 +7,7 @@ Exe decimal decimal - v4.5 + v4.6.2 --using="decimal=decimal" diff --git a/examples/cs/core/enumerations/enumerations.csproj b/examples/cs/core/enumerations/enumerations.csproj index 6ed6f0750c..02b264606a 100644 --- a/examples/cs/core/enumerations/enumerations.csproj +++ b/examples/cs/core/enumerations/enumerations.csproj @@ -7,7 +7,7 @@ Exe enumerations enumerations - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/generic_tree/generic_tree.csproj b/examples/cs/core/generic_tree/generic_tree.csproj index 14ce7ceccd..70f94df915 100644 --- a/examples/cs/core/generic_tree/generic_tree.csproj +++ b/examples/cs/core/generic_tree/generic_tree.csproj @@ -7,7 +7,7 @@ Exe generic_tree generic_tree - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/generics/generics.csproj b/examples/cs/core/generics/generics.csproj index 7a4990cc31..11ac30e296 100644 --- a/examples/cs/core/generics/generics.csproj +++ b/examples/cs/core/generics/generics.csproj @@ -7,7 +7,7 @@ Exe generics generics - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/guid/guid.csproj b/examples/cs/core/guid/guid.csproj index 79139e0ada..4501eff6d0 100644 --- a/examples/cs/core/guid/guid.csproj +++ b/examples/cs/core/guid/guid.csproj @@ -7,7 +7,7 @@ Exe guid guid - v4.5 + v4.6.2 --using="guid_str=System.Guid" --using="guid_bin=System.Guid" diff --git a/examples/cs/core/immutable_collections/immutable_collections.csproj b/examples/cs/core/immutable_collections/immutable_collections.csproj index 67b5449c71..7d9a689daa 100644 --- a/examples/cs/core/immutable_collections/immutable_collections.csproj +++ b/examples/cs/core/immutable_collections/immutable_collections.csproj @@ -5,7 +5,7 @@ Exe immutable_collections immutable_collections - net45 + net462 --using="ImmutableArray=System.Collections.Immutable.ImmutableArray<{0}>" --using="ImmutableList=System.Collections.Immutable.ImmutableList<{0}>" --using="ImmutableHashSet=System.Collections.Immutable.ImmutableHashSet<{0}>" --using="ImmutableSortedSet=System.Collections.Immutable.ImmutableSortedSet<{0}>" --using="ImmutableDictionary=System.Collections.Immutable.ImmutableDictionary<{0},{1}>" --using="ImmutableSortedDictionary=System.Collections.Immutable.ImmutableSortedDictionary<{0},{1}>" diff --git a/examples/cs/core/import/import.csproj b/examples/cs/core/import/import.csproj index 478f42856b..03af4d15bf 100644 --- a/examples/cs/core/import/import.csproj +++ b/examples/cs/core/import/import.csproj @@ -7,7 +7,7 @@ Exe import import - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/inheritance/inheritance.csproj b/examples/cs/core/inheritance/inheritance.csproj index e5a832724f..1d97d48df8 100644 --- a/examples/cs/core/inheritance/inheritance.csproj +++ b/examples/cs/core/inheritance/inheritance.csproj @@ -7,7 +7,7 @@ Exe inheritance inheritance - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/marshaling/marshaling.csproj b/examples/cs/core/marshaling/marshaling.csproj index bafdcc33f0..e5236c9a61 100644 --- a/examples/cs/core/marshaling/marshaling.csproj +++ b/examples/cs/core/marshaling/marshaling.csproj @@ -7,7 +7,7 @@ Exe marshaling marshaling - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/nothing_default/nothing_default.csproj b/examples/cs/core/nothing_default/nothing_default.csproj index aee62a468f..062051688f 100644 --- a/examples/cs/core/nothing_default/nothing_default.csproj +++ b/examples/cs/core/nothing_default/nothing_default.csproj @@ -7,7 +7,7 @@ Exe nothing_default nothing_default - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/polymorphic_container/polymorphic_container.csproj b/examples/cs/core/polymorphic_container/polymorphic_container.csproj index f2e1b74ba2..03c4eb567d 100644 --- a/examples/cs/core/polymorphic_container/polymorphic_container.csproj +++ b/examples/cs/core/polymorphic_container/polymorphic_container.csproj @@ -7,7 +7,7 @@ Exe generics generics - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/protocol_transcoding/protocol_transcoding.csproj b/examples/cs/core/protocol_transcoding/protocol_transcoding.csproj index 3f038e6d88..ccd55285fa 100644 --- a/examples/cs/core/protocol_transcoding/protocol_transcoding.csproj +++ b/examples/cs/core/protocol_transcoding/protocol_transcoding.csproj @@ -7,7 +7,7 @@ Exe protocol_transcoding protocol_transcoding - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/protocol_versions/protocol_versions.csproj b/examples/cs/core/protocol_versions/protocol_versions.csproj index 99f1ad733a..54cff8e401 100644 --- a/examples/cs/core/protocol_versions/protocol_versions.csproj +++ b/examples/cs/core/protocol_versions/protocol_versions.csproj @@ -7,7 +7,7 @@ Exe protocol_versions protocol_versions - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/record_streaming/record_streaming.csproj b/examples/cs/core/record_streaming/record_streaming.csproj index 998cd4415b..c44eade4b6 100644 --- a/examples/cs/core/record_streaming/record_streaming.csproj +++ b/examples/cs/core/record_streaming/record_streaming.csproj @@ -7,7 +7,7 @@ Exe record_streaming record_streaming - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/runtime_schema/runtime_schema.csproj b/examples/cs/core/runtime_schema/runtime_schema.csproj index f436020af2..25ced163e5 100644 --- a/examples/cs/core/runtime_schema/runtime_schema.csproj +++ b/examples/cs/core/runtime_schema/runtime_schema.csproj @@ -7,7 +7,7 @@ Exe runtime_schema runtime_schema - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/schema_view/schema_view.csproj b/examples/cs/core/schema_view/schema_view.csproj index 3d028d1d29..b064716ca9 100644 --- a/examples/cs/core/schema_view/schema_view.csproj +++ b/examples/cs/core/schema_view/schema_view.csproj @@ -7,7 +7,7 @@ Exe schema_view schema_view - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/serialization/serialization.csproj b/examples/cs/core/serialization/serialization.csproj index e2244cec01..f6ef81df1d 100644 --- a/examples/cs/core/serialization/serialization.csproj +++ b/examples/cs/core/serialization/serialization.csproj @@ -7,7 +7,7 @@ Exe serialization serialization - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/serializer/serializer.csproj b/examples/cs/core/serializer/serializer.csproj index b4856429bf..7a541b77bd 100644 --- a/examples/cs/core/serializer/serializer.csproj +++ b/examples/cs/core/serializer/serializer.csproj @@ -7,7 +7,7 @@ Exe serializer serializer - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/simple_json/simple_json.csproj b/examples/cs/core/simple_json/simple_json.csproj index cb18f36896..39815020c9 100644 --- a/examples/cs/core/simple_json/simple_json.csproj +++ b/examples/cs/core/simple_json/simple_json.csproj @@ -5,7 +5,7 @@ Exe simple_json simple_json - net45 + net462 diff --git a/examples/cs/core/simple_xml/simple_xml.csproj b/examples/cs/core/simple_xml/simple_xml.csproj index 052a6f0421..34cda5e71d 100644 --- a/examples/cs/core/simple_xml/simple_xml.csproj +++ b/examples/cs/core/simple_xml/simple_xml.csproj @@ -7,7 +7,7 @@ Exe simple_xml simple_xml - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/stream/stream.csproj b/examples/cs/core/stream/stream.csproj index ca1eb07f5c..3f577ed7f9 100644 --- a/examples/cs/core/stream/stream.csproj +++ b/examples/cs/core/stream/stream.csproj @@ -7,7 +7,7 @@ Exe stream stream - v4.5 + v4.6.2 AnyCPU diff --git a/examples/cs/core/untagged_protocols/untagged_protocols.csproj b/examples/cs/core/untagged_protocols/untagged_protocols.csproj index 80ffb9612d..b5fa3d25e2 100644 --- a/examples/cs/core/untagged_protocols/untagged_protocols.csproj +++ b/examples/cs/core/untagged_protocols/untagged_protocols.csproj @@ -7,7 +7,7 @@ Exe untagged_protocols untagged_protocols - v4.5 + v4.6.2 AnyCPU diff --git a/tools/ci-scripts/linux/build_cs.zsh b/tools/ci-scripts/linux/build_cs.zsh index bc6722c736..330745ac92 100755 --- a/tools/ci-scripts/linux/build_cs.zsh +++ b/tools/ci-scripts/linux/build_cs.zsh @@ -19,8 +19,6 @@ msbuild /p:Configuration=Debug /m $BOND_ROOT/cs/cs.sln msbuild /p:Configuration=Fields /m $BOND_ROOT/cs/cs.sln mono /root/NUnit.ConsoleRunner/tools/nunit3-console.exe -framework=mono -labels=All \ - $BOND_ROOT/cs/test/core/bin/debug/Properties/net45/Bond.UnitTest.dll \ - $BOND_ROOT/cs/test/core/bin/debug/Fields/net45/Bond.UnitTest.dll \ - $BOND_ROOT/cs/test/coreNS10/bin/debug/Properties/net45/Bond.UnitTestCoreNS10.dll \ - $BOND_ROOT/cs/test/coreNS10/bin/debug/Fields/net45/Bond.UnitTestCoreNS10.dll \ - $BOND_ROOT/cs/test/internal/bin/debug/net45/Bond.InternalTest.dll + $BOND_ROOT/cs/test/core/bin/debug/Properties/netstandard2.0/Bond.UnitTest.dll \ + $BOND_ROOT/cs/test/core/bin/debug/Fields/netstandard2.0/Bond.UnitTest.dll \ + $BOND_ROOT/cs/test/internal/bin/debug/netstandard2.0/Bond.InternalTest.dll