From 6b546a4421f2bad3e70954f3918f1cd9913a3b2e Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Thu, 31 Aug 2017 08:13:11 +1000 Subject: [PATCH 1/3] Add ILLink/netcoreapp2.0 --- Build.ps1 | 6 +++--- nuget.config | 8 ++++++++ piggy.sln | 6 +++++- src/Datalust.Piggy/Datalust.Piggy.csproj | 5 ++++- test/Datalust.Piggy.Tests/Datalust.Piggy.Tests.csproj | 2 +- 5 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 nuget.config diff --git a/Build.ps1 b/Build.ps1 index 1b25556..740578e 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -44,13 +44,13 @@ function Publish-Gzips($version) if($LASTEXITCODE -ne 0) { exit 4 } # Make sure the archive contains a reasonable root filename - mv ./src/Datalust.Piggy/bin/Release/netcoreapp1.1/$rid/publish/ ./src/Datalust.Piggy/bin/Release/netcoreapp1.1/$rid/piggy-$version-$rid/ + mv ./src/Datalust.Piggy/bin/Release/netcoreapp2.0/$rid/publish/ ./src/Datalust.Piggy/bin/Release/netcoreapp2.0/$rid/piggy-$version-$rid/ - & ./build/7-zip/7za.exe a -ttar piggy-$version-$rid.tar ./src/Datalust.Piggy/bin/Release/netcoreapp1.1/$rid/piggy-$version-$rid/ + & ./build/7-zip/7za.exe a -ttar piggy-$version-$rid.tar ./src/Datalust.Piggy/bin/Release/netcoreapp2.0/$rid/piggy-$version-$rid/ if($LASTEXITCODE -ne 0) { exit 5 } # Back to the original directory name - mv ./src/Datalust.Piggy/bin/Release/netcoreapp1.1/$rid/piggy-$version-$rid/ ./src/Datalust.Piggy/bin/Release/netcoreapp1.1/$rid/publish/ + mv ./src/Datalust.Piggy/bin/Release/netcoreapp2.0/$rid/piggy-$version-$rid/ ./src/Datalust.Piggy/bin/Release/netcoreapp2.0/$rid/publish/ & ./build/7-zip/7za.exe a -tgzip ./artifacts/piggy-$version-$rid.tar.gz piggy-$version-$rid.tar if($LASTEXITCODE -ne 0) { exit 6 } diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..5645e58 --- /dev/null +++ b/nuget.config @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/piggy.sln b/piggy.sln index 8093edc..9cf99de 100644 --- a/piggy.sln +++ b/piggy.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.16 +VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FC0A256C-CC1F-4ECE-AF09-707248D10DC1}" EndProject @@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{2EA56595-519 appveyor.yml = appveyor.yml Build.ps1 = Build.ps1 LICENSE = LICENSE + nuget.config = nuget.config README.md = README.md EndProjectSection EndProject @@ -70,4 +71,7 @@ Global {E3291CB6-F4A9-4A01-9E65-B70E2A32B0D5} = {3587B633-0C03-4235-8903-6226900328F1} {5E28D963-3523-49DE-B03B-E76684258415} = {203E8AE7-ADF0-44FA-A341-90723C8595F7} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {6D299713-28D4-4078-9DA7-9033679CD200} + EndGlobalSection EndGlobal diff --git a/src/Datalust.Piggy/Datalust.Piggy.csproj b/src/Datalust.Piggy/Datalust.Piggy.csproj index 421bef4..235a60b 100644 --- a/src/Datalust.Piggy/Datalust.Piggy.csproj +++ b/src/Datalust.Piggy/Datalust.Piggy.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp1.1 + netcoreapp2.0 piggy ..\..\asset\Piggy-Icon-128px.ico win10-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;rhel.7-x64;osx.10.12-x64 @@ -34,6 +34,9 @@ + + + \ No newline at end of file diff --git a/test/Datalust.Piggy.Tests/Datalust.Piggy.Tests.csproj b/test/Datalust.Piggy.Tests/Datalust.Piggy.Tests.csproj index e8a538e..7a44988 100644 --- a/test/Datalust.Piggy.Tests/Datalust.Piggy.Tests.csproj +++ b/test/Datalust.Piggy.Tests/Datalust.Piggy.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp1.1 + netcoreapp2.0 From 5100a0b4f7272b9f17ca95042754900400bf2063 Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Thu, 31 Aug 2017 08:53:43 +1000 Subject: [PATCH 2/3] Update to .NET Core 2, introduce ILLinker. --- Build.ps1 | 6 +- .../Datalust.Piggy.Setup.wixproj | 6 +- setup/Datalust.Piggy.Setup/Piggy.wxs | 556 ++++++++++-------- 3 files changed, 328 insertions(+), 240 deletions(-) diff --git a/Build.ps1 b/Build.ps1 index 740578e..2825a97 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -40,7 +40,7 @@ function Publish-Gzips($version) { $rids = @("ubuntu.14.04-x64", "ubuntu.16.04-x64", "rhel.7-x64", "osx.10.12-x64") foreach ($rid in $rids) { - & dotnet publish src/Datalust.Piggy/Datalust.Piggy.csproj -c Release -r $rid /p:VersionPrefix=$version + & dotnet publish src/Datalust.Piggy/Datalust.Piggy.csproj -c Release -f netcoreapp2.0 -r $rid /p:VersionPrefix=$version /p:ShowLinkerSizeComparison=true if($LASTEXITCODE -ne 0) { exit 4 } # Make sure the archive contains a reasonable root filename @@ -61,10 +61,10 @@ function Publish-Gzips($version) function Publish-Msi($version) { - & dotnet publish src/Datalust.Piggy/Datalust.Piggy.csproj -c Release -r win10-x64 /p:VersionPrefix=$version + & dotnet publish src/Datalust.Piggy/Datalust.Piggy.csproj -c Release -f netcoreapp2.0 -r win10-x64 /p:VersionPrefix=$version /p:ShowLinkerSizeComparison=true if($LASTEXITCODE -ne 0) { exit 7 } - & msbuild ./setup/Datalust.Piggy.Setup/Datalust.Piggy.Setup.wixproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:Version=$version + & msbuild ./setup/Datalust.Piggy.Setup/Datalust.Piggy.Setup.wixproj /t:Build /p:Configuration=Release /p:Platform=x64 /p:Version=$version /p:BuildProjectReferences=false if($LASTEXITCODE -ne 0) { exit 8 } mv ./setup/Datalust.Piggy.Setup/bin/Release/piggy.msi ./artifacts/piggy-$version.msi diff --git a/setup/Datalust.Piggy.Setup/Datalust.Piggy.Setup.wixproj b/setup/Datalust.Piggy.Setup/Datalust.Piggy.Setup.wixproj index ea93964..04b3485 100644 --- a/setup/Datalust.Piggy.Setup/Datalust.Piggy.Setup.wixproj +++ b/setup/Datalust.Piggy.Setup/Datalust.Piggy.Setup.wixproj @@ -48,9 +48,9 @@ - ..\..\src\Datalust.Piggy\bin\$(Configuration)\netcoreapp1.1\win10-x64\publish - BasePath=..\..\src\Datalust.Piggy\bin\$(Configuration)\netcoreapp1.1\win10-x64\publish + ..\..\src\Datalust.Piggy\bin\$(Configuration)\netcoreapp2.0\win10-x64\publish + BasePath=..\..\src\Datalust.Piggy\bin\$(Configuration)\netcoreapp2.0\win10-x64\publish - + \ No newline at end of file diff --git a/setup/Datalust.Piggy.Setup/Piggy.wxs b/setup/Datalust.Piggy.Setup/Piggy.wxs index 1aa75bc..f2dc701 100644 --- a/setup/Datalust.Piggy.Setup/Piggy.wxs +++ b/setup/Datalust.Piggy.Setup/Piggy.wxs @@ -2,428 +2,494 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + - - - - + - + - + - - - - - + + - - + + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - - + - + - + - - - - + - + - - - - + - + - + - + - + - + - + + + + - + - - - - + - + - + - + + + + - - + + - - + + - + - - - - + - - - - + - + - + - - - - - - - - - - - - - + - + - - - - - - - + - + - + - + - + - + - + + + + - + - - - - + - + - - - - + - - + + + + + - + - + - + - + - + - - - - + - + - - - - + - + - + - + - + - + - - - - + - + + + + + + + - + - + - + - + - - - - + - + - + - + - + - + - + - + - + - + - - - - + - + - - - - + - + - + - + + + + - + - + - + + + + - - + + - + - + - + - + @@ -431,6 +497,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -440,21 +546,15 @@ - - - - - - + - - + @@ -470,82 +570,70 @@ - - + - - + - + + - - - - - - - - - + - - - + + - - - + + - @@ -556,18 +644,18 @@ - - + + - + From c2708d6f72d24069d607ae03408cdc1119674fa9 Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Wed, 20 Sep 2017 09:39:12 +1000 Subject: [PATCH 3/3] Update to the latest preview of ILLink.Tasks --- src/Datalust.Piggy/Datalust.Piggy.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Datalust.Piggy/Datalust.Piggy.csproj b/src/Datalust.Piggy/Datalust.Piggy.csproj index 235a60b..9a2b28e 100644 --- a/src/Datalust.Piggy/Datalust.Piggy.csproj +++ b/src/Datalust.Piggy/Datalust.Piggy.csproj @@ -36,7 +36,7 @@ - + \ No newline at end of file