diff --git a/Sigil/Sigil.xproj b/Sigil/Sigil.xproj index 86191cd..2ab6de0 100644 --- a/Sigil/Sigil.xproj +++ b/Sigil/Sigil.xproj @@ -9,7 +9,7 @@ 3f959ab7-a1c2-41da-a1f3-981ea89a0067 Sigil ..\artifacts\obj\$(MSBuildProjectName) - ..\artifacts\bin\$(MSBuildProjectName)\ + .\bin\ 2.0 diff --git a/Sigil/project.json b/Sigil/project.json index 28e0090..4f9deeb 100644 --- a/Sigil/project.json +++ b/Sigil/project.json @@ -1,58 +1,49 @@ { + "packOptions": { + "summary": "A fail-fast validation helper for .NET CIL generation.", + "tags": [ "cil msil il bytecode" ], + "owners": [ "kmontrose" ], + "releaseNotes": ".NET Core RC2 update", + "requireLicenseAcceptance": false, + "projectUrl": "https://github.com/kevin-montrose/Sigil", + "licenseUrl": "http://opensource.org/licenses/MS-PL", + "repository": { + "type": "git", + "url": "https://github.com/kevin-montrose/Sigil" + } + }, "version": "4.6.1", "description": "A fail-fast validation helper for .NET CIL generation.", "authors": [ "kmontrose" ], - "tags": [ "cil msil il bytecode" ], - "projectUrl": "https://github.com/kevin-montrose/Sigil", - "licenseUrl": "http://opensource.org/licenses/MS-PL", - "releaseNotes": "Fix bugs with tailcalls, verification around object <-> ValueType relations, and add new options for loading function pointers.", "copyright": "2013-2016 Kevin Montrose", - "requireLicenseAcceptance": false, - "compilationOptions": { + "buildOptions": { "keyFile": "../Sigil/Properties/Sigil.snk" }, "frameworks": { "net20": { - "compilationOptions": { "define": [ "NET20" ] } + "buildOptions": { "define": [ "NET20" ] } }, "net30": { - "compilationOptions": { "define": [ "NET30" ] } + "buildOptions": { "define": [ "NET30" ] } }, "net35": { - "compilationOptions": { "define": [ "NET35" ] } + "buildOptions": { "define": [ "NET35" ] } }, "net40": { - "compilationOptions": { "define": [ "NET40" ] } + "buildOptions": { "define": [ "NET40" ] } }, "net45": { - "compilationOptions": { "define": [ "NET45" ] } - }, - "dotnet5.2": { - "compilationOptions": { "define": [ "COREFX", "COREFXTODO" ] }, - "dependencies": { - "Microsoft.CSharp": "4.0.1-*", - "System.Collections": "4.0.11-*", - "System.Reflection.Emit": "4.0.1-*", - "System.Reflection.Emit.ILGeneration": "4.0.1-*", - "System.Reflection.Emit.Lightweight": "4.0.1-*", - "System.Reflection.TypeExtensions": "4.1.0-*", - "System.Text.RegularExpressions": "4.0.11-*", - "System.Console": "4.0.0-*", - "System.Reflection.Metadata": "1.1.1-*" - } + "buildOptions": { "define": [ "NET45" ] } }, - "dotnet5.4": { - "compilationOptions": { "define": [ "COREFX", "COREFXTODO" ] }, + "netstandard1.5": { + "buildOptions": { "define": [ "COREFX", "COREFXTODO" ] }, "dependencies": { - "Microsoft.CSharp": "4.0.1-*", - "System.Collections": "4.0.11-*", - "System.Reflection.Emit": "4.0.1-*", - "System.Reflection.Emit.ILGeneration": "4.0.1-*", - "System.Reflection.Emit.Lightweight": "4.0.1-*", - "System.Reflection.TypeExtensions": "4.1.0-*", - "System.Text.RegularExpressions": "4.0.11-*", - "System.Console": "4.0.0-*", - "System.Reflection.Metadata": "1.1.1-*" + "NETStandard.Library": "1.5.0-rc2-24027", + "System.Reflection.Emit": "4.0.1-rc2-24027", + "System.Reflection.Emit.ILGeneration": "4.0.1-rc2-24027", + "System.Reflection.Emit.Lightweight": "4.0.1-rc2-24027", + "System.Reflection.TypeExtensions": "4.1.0-rc2-24027", + "System.Reflection.Metadata": "1.3.0-rc2-24027*" } } } diff --git a/SigilTests.DNX/SigilTests.DNX.xproj b/SigilTests.DNX/SigilTests.DNX.xproj index 46361b9..843bfa2 100644 --- a/SigilTests.DNX/SigilTests.DNX.xproj +++ b/SigilTests.DNX/SigilTests.DNX.xproj @@ -4,17 +4,15 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - ac7e3c9d-9b25-4da8-9d1d-fd7ee39a6a9e SigilTests.DNX ..\artifacts\obj\$(MSBuildProjectName) - ..\artifacts\bin\$(MSBuildProjectName)\ + .\bin\ - 2.0 - + \ No newline at end of file diff --git a/SigilTests.DNX/project.json b/SigilTests.DNX/project.json index 0093e55..c0bd2c8 100644 --- a/SigilTests.DNX/project.json +++ b/SigilTests.DNX/project.json @@ -2,33 +2,38 @@ "version": "1.0.0-*", "description": "SigilTests Console Application", "authors": [ "Kevin Montrose" ], - "tags": [ "" ], - "projectUrl": "", - "licenseUrl": "", - "compile": [ - "**/*.cs", - "../SigilTests/**/*.cs" - ], "dependencies": { "Sigil": { "target": "project" } }, - "compilationOptions": { "allowUnsafe": true }, + "buildOptions": { + "allowUnsafe": true , + "emitEntryPoint": true, + "compile": { + "include":[ + "**/*.cs", + "../SigilTests/**/*.cs" + ] + } + }, "commands": { "test": "xunit.runner.dnx" }, - + "testRunner": "xunit", "frameworks": { - "dnxcore50": { - "compilationOptions": { + "netcoreapp1.0": { + "imports": [ "dnxcore50", "portable-net45+win8" ], + "buildOptions": { "define": [ "COREFX", "COREFXTODO" ], "defineForCrazy": [ "COREFX", "COREFXTODO", "WTFDNXTEST" ] }, "dependencies": { - "Microsoft.CSharp": "4.0.1-*", - "System.Collections": "4.0.11-*", - "System.Console": "4.0.0-*", + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-3002702", + "type": "platform" + }, + "Microsoft.CSharp": "4.0.1-rc2-24027", "xunit": "2.1.0", - "xunit.runner.dnx": "2.1.0-*" + "dotnet-test-xunit": "1.0.0-rc2-*" } } } diff --git a/global.json b/global.json index 517ac55..1df4f8b 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "1.0.0-rc1-final" + "version": "1.0.0-preview1-002702" } }