From 66c3016f163a9d2433bb6262ea60716aff78a54c Mon Sep 17 00:00:00 2001 From: Tim Slater Date: Tue, 15 Oct 2019 19:30:55 -0500 Subject: [PATCH] Upgrade Pivet to .NET Core 3.0 --- Pivet/Pivet.csproj | 10 +++---- Pivet/Properties/PublishProfiles/Linux.pubxml | 4 +-- .../PublishProfiles/LinuxSelfContained.pubxml | 4 +-- .../Properties/PublishProfiles/RedHat.pubxml | 4 +-- .../RedHatSelfContained.pubxml | 4 +-- .../Properties/PublishProfiles/Windows.pubxml | 4 +-- .../WindowsSelfContained.pubxml | 4 +-- SamplePlugin/SamplePlugin.csproj | 7 ++--- publish.ps1 | 30 +++++++++---------- 9 files changed, 35 insertions(+), 36 deletions(-) diff --git a/Pivet/Pivet.csproj b/Pivet/Pivet.csproj index 7376d63..f355879 100644 --- a/Pivet/Pivet.csproj +++ b/Pivet/Pivet.csproj @@ -2,14 +2,14 @@ Exe - netcoreapp2.2 - 2.2.7 - win10-x64;linux-x64 + netcoreapp3.0 + win10-x64;osx-x64;linux-x64;rhel-x64 + Pivet.Program - + x64 - TRACE;DEBUG;NETCOREAPP;NETCOREAPP2_2 + TRACE;DEBUG;NETCOREAPP;NETCOREAPP3_0 diff --git a/Pivet/Properties/PublishProfiles/Linux.pubxml b/Pivet/Properties/PublishProfiles/Linux.pubxml index b2304de..9dd738d 100644 --- a/Pivet/Properties/PublishProfiles/Linux.pubxml +++ b/Pivet/Properties/PublishProfiles/Linux.pubxml @@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release Any CPU - netcoreapp2.2 - bin\Release\netcoreapp2.2\publish\linux\ + netcoreapp3.0 + bin\Release\netcoreapp3.0\publish\linux\ linux-x64 false <_IsPortable>true diff --git a/Pivet/Properties/PublishProfiles/LinuxSelfContained.pubxml b/Pivet/Properties/PublishProfiles/LinuxSelfContained.pubxml index 7d328e6..b99a02c 100644 --- a/Pivet/Properties/PublishProfiles/LinuxSelfContained.pubxml +++ b/Pivet/Properties/PublishProfiles/LinuxSelfContained.pubxml @@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release Any CPU - netcoreapp2.2 - bin\Release\netcoreapp2.2\publish\linux-self-contained + netcoreapp3.0 + bin\Release\netcoreapp3.0\publish\linux-self-contained linux-x64 true <_IsPortable>true diff --git a/Pivet/Properties/PublishProfiles/RedHat.pubxml b/Pivet/Properties/PublishProfiles/RedHat.pubxml index e5f09f0..cf1e9c1 100644 --- a/Pivet/Properties/PublishProfiles/RedHat.pubxml +++ b/Pivet/Properties/PublishProfiles/RedHat.pubxml @@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release Any CPU - netcoreapp2.2 - bin\Release\netcoreapp2.2\publish\rhel + netcoreapp3.0 + bin\Release\netcoreapp3.0\publish\rhel rhel-x64 false <_IsPortable>true diff --git a/Pivet/Properties/PublishProfiles/RedHatSelfContained.pubxml b/Pivet/Properties/PublishProfiles/RedHatSelfContained.pubxml index 20e5778..18413ff 100644 --- a/Pivet/Properties/PublishProfiles/RedHatSelfContained.pubxml +++ b/Pivet/Properties/PublishProfiles/RedHatSelfContained.pubxml @@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release Any CPU - netcoreapp2.2 - bin\Release\netcoreapp2.2\publish\rhel-self-contained + netcoreapp3.0 + bin\Release\netcoreapp3.0\publish\rhel-self-contained rhel-x64 true <_IsPortable>true diff --git a/Pivet/Properties/PublishProfiles/Windows.pubxml b/Pivet/Properties/PublishProfiles/Windows.pubxml index 4065871..74566b0 100644 --- a/Pivet/Properties/PublishProfiles/Windows.pubxml +++ b/Pivet/Properties/PublishProfiles/Windows.pubxml @@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release Any CPU - netcoreapp2.2 - bin\Release\netcoreapp2.2\publish\windows + netcoreapp3.0 + bin\Release\netcoreapp3.0\publish\windows win10-x64 false <_IsPortable>true diff --git a/Pivet/Properties/PublishProfiles/WindowsSelfContained.pubxml b/Pivet/Properties/PublishProfiles/WindowsSelfContained.pubxml index feacf4b..8a85e0b 100644 --- a/Pivet/Properties/PublishProfiles/WindowsSelfContained.pubxml +++ b/Pivet/Properties/PublishProfiles/WindowsSelfContained.pubxml @@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release Any CPU - netcoreapp2.2 - bin\Release\netcoreapp2.2\publish\windows-self-contained + netcoreapp3.0 + bin\Release\netcoreapp3.0\publish\windows-self-contained win10-x64 true <_IsPortable>true diff --git a/SamplePlugin/SamplePlugin.csproj b/SamplePlugin/SamplePlugin.csproj index 718b480..d58ac57 100644 --- a/SamplePlugin/SamplePlugin.csproj +++ b/SamplePlugin/SamplePlugin.csproj @@ -1,9 +1,8 @@ - + - netcoreapp2.2 - 2.2.7 - win10-x64;osx-x64;linux-x64 + netcoreapp3.0 + win10-x64;osx-x64;linux-x64;rhel-x64 diff --git a/publish.ps1 b/publish.ps1 index 762e794..18543eb 100644 --- a/publish.ps1 +++ b/publish.ps1 @@ -1,14 +1,14 @@ -if (Test-Path ".\Pivet\bin\Release\netcoreapp2.2\publish\") { - Remove-Item ".\Pivet\bin\Release\netcoreapp2.2\publish\" -Recurse -Force; +if (Test-Path ".\Pivet\bin\Release\netcoreapp3.0\publish\") { + Remove-Item ".\Pivet\bin\Release\netcoreapp3.0\publish\" -Recurse -Force; } -dotnet publish .\Pivet\Pivet.csproj /p:PublishProfile=Linux /p:Configuration=Release -f netcoreapp2.2 -dotnet publish .\Pivet\Pivet.csproj /p:PublishProfile=Windows /p:Configuration=Release -f netcoreapp2.2 -dotnet publish .\Pivet\Pivet.csproj /p:PublishProfile=RedHat /p:Configuration=Release -f netcoreapp2.2 +dotnet publish .\Pivet\Pivet.csproj /p:PublishProfile=Linux /p:Configuration=Release -f netcoreapp3.0 +dotnet publish .\Pivet\Pivet.csproj /p:PublishProfile=Windows /p:Configuration=Release -f netcoreapp3.0 +dotnet publish .\Pivet\Pivet.csproj /p:PublishProfile=RedHat /p:Configuration=Release -f netcoreapp3.0 -dotnet publish .\Pivet\Pivet.csproj /p:PublishProfile=LinuxSelfContained /p:Configuration=Release -f netcoreapp2.2 -dotnet publish .\Pivet\Pivet.csproj /p:PublishProfile=WindowsSelfContained /p:Configuration=Release -f netcoreapp2.2 -dotnet publish .\Pivet\Pivet.csproj /p:PublishProfile=RedHatSelfContained /p:Configuration=Release -f netcoreapp2.2 +dotnet publish .\Pivet\Pivet.csproj /p:PublishProfile=LinuxSelfContained /p:Configuration=Release -f netcoreapp3.0 +dotnet publish .\Pivet\Pivet.csproj /p:PublishProfile=WindowsSelfContained /p:Configuration=Release -f netcoreapp3.0 +dotnet publish .\Pivet\Pivet.csproj /p:PublishProfile=RedHatSelfContained /p:Configuration=Release -f netcoreapp3.0 If(!(test-path ".\build")) { @@ -18,12 +18,12 @@ If(!(test-path ".\build")) $commit= &git rev-parse HEAD $hash = $commit.Substring(0,7) -Get-ChildItem -Recurse -Path .\Pivet\bin\Release\netcoreapp2.2\publish\ *.pdb | foreach {Remove-Item -Path $_.FullName} +Get-ChildItem -Recurse -Path .\Pivet\bin\Release\netcoreapp3.0\publish\ *.pdb | foreach {Remove-Item -Path $_.FullName} -Compress-Archive -Force -Path .\Pivet\bin\Release\netcoreapp2.2\publish\linux\* -DestinationPath ".\build\linux-$($hash).zip" -Compress-Archive -Force -Path .\Pivet\bin\Release\netcoreapp2.2\publish\windows\* -DestinationPath ".\build\windows-$($hash).zip" -Compress-Archive -Force -Path .\Pivet\bin\Release\netcoreapp2.2\publish\rhel\* -DestinationPath ".\build\redhat-$($hash).zip" +Compress-Archive -Force -Path .\Pivet\bin\Release\netcoreapp3.0\publish\linux\* -DestinationPath ".\build\linux-$($hash).zip" +Compress-Archive -Force -Path .\Pivet\bin\Release\netcoreapp3.0\publish\windows\* -DestinationPath ".\build\windows-$($hash).zip" +Compress-Archive -Force -Path .\Pivet\bin\Release\netcoreapp3.0\publish\rhel\* -DestinationPath ".\build\redhat-$($hash).zip" -Compress-Archive -Force -Path .\Pivet\bin\Release\netcoreapp2.2\publish\linux-self-contained\* -DestinationPath ".\build\linux-self-contained-$($hash).zip" -Compress-Archive -Force -Path .\Pivet\bin\Release\netcoreapp2.2\publish\windows-self-contained\* -DestinationPath ".\build\windows-self-contained-$($hash).zip" -Compress-Archive -Force -Path .\Pivet\bin\Release\netcoreapp2.2\publish\rhel-self-contained\* -DestinationPath ".\build\redhat-self-contained-$($hash).zip" \ No newline at end of file +Compress-Archive -Force -Path .\Pivet\bin\Release\netcoreapp3.0\publish\linux-self-contained\* -DestinationPath ".\build\linux-self-contained-$($hash).zip" +Compress-Archive -Force -Path .\Pivet\bin\Release\netcoreapp3.0\publish\windows-self-contained\* -DestinationPath ".\build\windows-self-contained-$($hash).zip" +Compress-Archive -Force -Path .\Pivet\bin\Release\netcoreapp3.0\publish\rhel-self-contained\* -DestinationPath ".\build\redhat-self-contained-$($hash).zip" \ No newline at end of file