This has one important packaging change: the netstandard version now depends (implicitly) on netstandard1.6.1 rather than on individual packages. This is the preferred style of dependency, and shouldn't affect any users - see http://stackoverflow.com/questions/42946951 for details. The tests are still NUnit, but NUnit doesn't support "dotnet test" yet; the test project is now an executable using NUnitLite. (When NUnit supports dotnet test, we can adapt to it.) Note that the project will now only work in Visual Studio 2017 (and Visual Studio Code, and from the command line with the .NET Core 1.0.0 SDK); Visual Studio 2015 does *not* support this project file format.pull/3140/head
Jon Skeet
8 years ago
committed by
Jon Skeet
parent
40da1ed572
commit
f26e8c2ae0
33 changed files with 269 additions and 388 deletions
@ -0,0 +1,47 @@ |
|||||||
|
#region Copyright notice and license |
||||||
|
// Protocol Buffers - Google's data interchange format |
||||||
|
// Copyright 2017 Google Inc. All rights reserved. |
||||||
|
// https://developers.google.com/protocol-buffers/ |
||||||
|
// |
||||||
|
// Redistribution and use in source and binary forms, with or without |
||||||
|
// modification, are permitted provided that the following conditions are |
||||||
|
// met: |
||||||
|
// |
||||||
|
// * Redistributions of source code must retain the above copyright |
||||||
|
// notice, this list of conditions and the following disclaimer. |
||||||
|
// * Redistributions in binary form must reproduce the above |
||||||
|
// copyright notice, this list of conditions and the following disclaimer |
||||||
|
// in the documentation and/or other materials provided with the |
||||||
|
// distribution. |
||||||
|
// * Neither the name of Google Inc. nor the names of its |
||||||
|
// contributors may be used to endorse or promote products derived from |
||||||
|
// this software without specific prior written permission. |
||||||
|
// |
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||||
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||||
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||||
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||||
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||||
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||||
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||||
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||||
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||||
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
#endregion |
||||||
|
using NUnitLite; |
||||||
|
using System.Reflection; |
||||||
|
|
||||||
|
// Note: this file wasn't in the actual 3.0, but is required due to build |
||||||
|
// system changes |
||||||
|
|
||||||
|
namespace Google.Protobuf.Test |
||||||
|
{ |
||||||
|
class Program |
||||||
|
{ |
||||||
|
public static int Main(string[] args) |
||||||
|
{ |
||||||
|
return new AutoRun(typeof(Program).GetTypeInfo().Assembly).Execute(args); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
@ -1,44 +0,0 @@ |
|||||||
{ |
|
||||||
"buildOptions": { |
|
||||||
"debugType": "portable", |
|
||||||
"keyFile": "../../keys/Google.Protobuf.snk" |
|
||||||
}, |
|
||||||
|
|
||||||
"configurations": { |
|
||||||
"Debug": { |
|
||||||
"buildOptions": { |
|
||||||
"define": [ "DEBUG", "TRACE" ] |
|
||||||
} |
|
||||||
}, |
|
||||||
"Release": { |
|
||||||
"buildOptions": { |
|
||||||
"define": [ "RELEASE", "TRACE" ], |
|
||||||
"optimize": true |
|
||||||
} |
|
||||||
} |
|
||||||
}, |
|
||||||
|
|
||||||
"dependencies": { |
|
||||||
"Google.Protobuf": { "target": "project" }, |
|
||||||
"NUnit": "3.4.0", |
|
||||||
"dotnet-test-nunit": "3.4.0-alpha-2", |
|
||||||
}, |
|
||||||
|
|
||||||
"testRunner": "nunit", |
|
||||||
|
|
||||||
"frameworks": { |
|
||||||
"netcoreapp1.0": { |
|
||||||
"imports" : [ "dnxcore50", "netcoreapp1.0", "portable-net45+win8" ], |
|
||||||
"buildOptions": { |
|
||||||
"define": [ "PCL" ] |
|
||||||
}, |
|
||||||
"dependencies": { |
|
||||||
"Microsoft.NETCore.App": { |
|
||||||
"version": "1.0.0", |
|
||||||
"type": "platform" |
|
||||||
}, |
|
||||||
"System.Console": "4.0.0" |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,20 +0,0 @@ |
|||||||
{ |
|
||||||
"buildOptions": { |
|
||||||
"debugType": "portable", |
|
||||||
"emitEntryPoint": true, |
|
||||||
"additionalArguments": [ "/main:Google.Protobuf.Examples.AddressBook.Program" ] |
|
||||||
}, |
|
||||||
"dependencies": { |
|
||||||
"Google.Protobuf": { "target": "project" } |
|
||||||
}, |
|
||||||
"frameworks": { |
|
||||||
"netcoreapp1.0": { |
|
||||||
"dependencies": { |
|
||||||
"Microsoft.NETCore.App": { |
|
||||||
"type": "platform", |
|
||||||
"version": "1.0.0" |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,21 +0,0 @@ |
|||||||
{ |
|
||||||
"buildOptions": { |
|
||||||
"debugType": "portable", |
|
||||||
"emitEntryPoint": true |
|
||||||
}, |
|
||||||
"dependencies": { |
|
||||||
"Google.Protobuf": { "target": "project" }, |
|
||||||
"Google.Protobuf.Test": { "target": "project" } |
|
||||||
}, |
|
||||||
"frameworks": { |
|
||||||
"netcoreapp1.0": { |
|
||||||
"imports": [ "dnxcore50", "netcoreapp1.0", "portable-net45+win8" ], |
|
||||||
"dependencies": { |
|
||||||
"Microsoft.NETCore.App": { |
|
||||||
"type": "platform", |
|
||||||
"version": "1.0.0" |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,19 +0,0 @@ |
|||||||
{ |
|
||||||
"buildOptions": { |
|
||||||
"debugType": "portable", |
|
||||||
"emitEntryPoint": true |
|
||||||
}, |
|
||||||
"dependencies": { |
|
||||||
"Google.Protobuf": { "target": "project" } |
|
||||||
}, |
|
||||||
"frameworks": { |
|
||||||
"netcoreapp1.0": { |
|
||||||
"dependencies": { |
|
||||||
"Microsoft.NETCore.App": { |
|
||||||
"type": "platform", |
|
||||||
"version": "1.0.0" |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
@ -0,0 +1,44 @@ |
|||||||
|
#region Copyright notice and license |
||||||
|
// Protocol Buffers - Google's data interchange format |
||||||
|
// Copyright 2017 Google Inc. All rights reserved. |
||||||
|
// https://developers.google.com/protocol-buffers/ |
||||||
|
// |
||||||
|
// Redistribution and use in source and binary forms, with or without |
||||||
|
// modification, are permitted provided that the following conditions are |
||||||
|
// met: |
||||||
|
// |
||||||
|
// * Redistributions of source code must retain the above copyright |
||||||
|
// notice, this list of conditions and the following disclaimer. |
||||||
|
// * Redistributions in binary form must reproduce the above |
||||||
|
// copyright notice, this list of conditions and the following disclaimer |
||||||
|
// in the documentation and/or other materials provided with the |
||||||
|
// distribution. |
||||||
|
// * Neither the name of Google Inc. nor the names of its |
||||||
|
// contributors may be used to endorse or promote products derived from |
||||||
|
// this software without specific prior written permission. |
||||||
|
// |
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||||
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||||
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||||
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||||
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||||
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||||
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||||
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||||
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||||
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
#endregion |
||||||
|
using NUnitLite; |
||||||
|
using System.Reflection; |
||||||
|
|
||||||
|
namespace Google.Protobuf.Test |
||||||
|
{ |
||||||
|
class Program |
||||||
|
{ |
||||||
|
public static int Main(string[] args) |
||||||
|
{ |
||||||
|
return new AutoRun(typeof(Program).GetTypeInfo().Assembly).Execute(args); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
@ -1,45 +0,0 @@ |
|||||||
{ |
|
||||||
"buildOptions": { |
|
||||||
"debugType": "portable", |
|
||||||
"keyFile": "../../keys/Google.Protobuf.snk" |
|
||||||
}, |
|
||||||
|
|
||||||
"configurations": { |
|
||||||
"Debug": { |
|
||||||
"buildOptions": { |
|
||||||
"define": [ "DEBUG", "TRACE" ] |
|
||||||
} |
|
||||||
}, |
|
||||||
"Release": { |
|
||||||
"buildOptions": { |
|
||||||
"define": [ "RELEASE", "TRACE" ], |
|
||||||
"optimize": true |
|
||||||
} |
|
||||||
} |
|
||||||
}, |
|
||||||
|
|
||||||
"dependencies": { |
|
||||||
"Google.Protobuf": { "target": "project" }, |
|
||||||
"dotnet-test-nunit": "3.4.0-beta-3", |
|
||||||
"NUnit": "3.6.0" |
|
||||||
}, |
|
||||||
|
|
||||||
"testRunner": "nunit", |
|
||||||
|
|
||||||
"frameworks": { |
|
||||||
"net451": {}, |
|
||||||
"netcoreapp1.0": { |
|
||||||
"imports" : [ "dnxcore50", "netcoreapp1.0", "portable-net45+win8" ], |
|
||||||
"buildOptions": { |
|
||||||
"define": [ "PCL" ] |
|
||||||
}, |
|
||||||
"dependencies": { |
|
||||||
"Microsoft.NETCore.App": { |
|
||||||
"version": "1.0.0", |
|
||||||
"type": "platform" |
|
||||||
}, |
|
||||||
"System.Console": "4.0.0" |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,65 +0,0 @@ |
|||||||
{ |
|
||||||
"version": "3.3.0", |
|
||||||
"title": "Google Protocol Buffers", |
|
||||||
"description": "See project site for more info.", |
|
||||||
"authors": [ "Google Inc." ], |
|
||||||
"copyright": "Copyright 2015, Google Inc.", |
|
||||||
|
|
||||||
"packOptions": { |
|
||||||
"summary": "C# runtime library for Protocol Buffers - Google's data interchange format.", |
|
||||||
"tags": [ "Protocol", "Buffers", "Binary", "Serialization", "Format", "Google", "proto", "proto3" ], |
|
||||||
"owners": [ "protobuf-packages" ], |
|
||||||
"licenseUrl": "https://github.com/google/protobuf/blob/master/LICENSE", |
|
||||||
"projectUrl": "https://github.com/google/protobuf", |
|
||||||
"releaseNotes": "C# proto3 support", |
|
||||||
"requireLicenseAcceptance": false, |
|
||||||
"repository": { |
|
||||||
"url": "https://github.com/nodatime/nodatime.git" |
|
||||||
} |
|
||||||
}, |
|
||||||
|
|
||||||
"buildOptions": { |
|
||||||
"debugType": "portable", |
|
||||||
"keyFile": "../../keys/Google.Protobuf.snk", |
|
||||||
"xmlDoc": true |
|
||||||
}, |
|
||||||
|
|
||||||
"configurations": { |
|
||||||
"Debug": { |
|
||||||
"buildOptions": { |
|
||||||
"define": [ "DEBUG", "TRACE" ] |
|
||||||
} |
|
||||||
}, |
|
||||||
"Release": { |
|
||||||
"buildOptions": { |
|
||||||
"define": [ "RELEASE", "TRACE" ], |
|
||||||
"optimize": true |
|
||||||
} |
|
||||||
} |
|
||||||
}, |
|
||||||
|
|
||||||
"frameworks": { |
|
||||||
// This target allows the package to be installed in a .NET 4.5+ |
|
||||||
// project without asking for myriad other dependencies. |
|
||||||
"net45": { |
|
||||||
}, |
|
||||||
"netstandard1.0": { |
|
||||||
"dependencies": { |
|
||||||
"System.Collections": "4.0.11", |
|
||||||
"System.Diagnostics.Debug": "4.0.11", |
|
||||||
"System.Globalization": "4.0.11", |
|
||||||
"System.IO": "4.1.0", |
|
||||||
"System.Linq": "4.1.0", |
|
||||||
"System.Linq.Expressions": "4.1.0", |
|
||||||
"System.ObjectModel": "4.0.12", |
|
||||||
"System.Reflection": "4.1.0", |
|
||||||
"System.Reflection.Extensions": "4.0.1", |
|
||||||
"System.Runtime": "4.1.0", |
|
||||||
"System.Runtime.Extensions": "4.1.0", |
|
||||||
"System.Text.Encoding": "4.0.11", |
|
||||||
"System.Text.RegularExpressions": "4.1.0", |
|
||||||
"System.Threading": "4.0.11" |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
Loading…
Reference in new issue