Browse Source

Minimal changes for building on .NET 6.0

pull/2642/head
Christoph Wille 4 years ago
parent
commit
9a4f5bc664
  1. 49
      .github/workflows/build-ilspy.yml
  2. 30
      BuildTools/update-assemblyinfo.ps1

49
.github/workflows/build-ilspy.yml

@ -12,19 +12,7 @@ jobs: @@ -12,19 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
include:
- configuration: debug
solution: ilspy.sln
channel: zip
- configuration: release
solution: ilspy.sln
channel: zip
- configuration: release
solution: ilspy.withpackage.sln
channel: ci
- configuration: release
solution: ilspy.withpackage.sln
channel: store
Configuration: [ Debug, Release ]
env:
BuildPlatform: Any CPU
StagingDirectory: buildartifacts
@ -58,39 +46,29 @@ jobs: @@ -58,39 +46,29 @@ jobs:
Get-ChildItem Env: | Where-Object {$_.Name -Match "^ILSPY_"} | %{ echo "::set-output name=$($_.Name)::$($_.Value)" }
- name: Restore the application
run: msbuild ${{ matrix.solution }} /t:Restore /p:Configuration=${{ matrix.configuration }} /p:Platform=$env:BuildPlatform
run: msbuild ILSpy.sln /t:Restore /p:Configuration=${{ matrix.configuration }} /p:Platform=$env:BuildPlatform
- name: Build
run: msbuild ${{ matrix.solution }} /p:Configuration=${{ matrix.configuration }} /p:Platform=$env:BuildPlatform /p:AppxPackageDir="${{ github.workspace }}\${{ env.StagingDirectory }}\${{ matrix.channel }}\"
env:
ReleaseChannel: ${{ matrix.channel }}
run: msbuild ILSpy.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=$env:BuildPlatform
- name: Execute unit tests
run: dotnet test $env:Tests1 $env:Tests2 $env:Tests3
env:
Tests1: ICSharpCode.Decompiler.Tests\bin\${{ matrix.configuration }}\net472\ICSharpCode.Decompiler.Tests.exe
Tests2: ILSpy.Tests\bin\${{ matrix.configuration }}\net472\ILSpy.Tests.exe
Tests3: ILSpy.BamlDecompiler.Tests\bin\${{ matrix.configuration }}\net472\ILSpy.BamlDecompiler.Tests.exe
Tests1: ICSharpCode.Decompiler.Tests\bin\${{ matrix.configuration }}\net6.0\ICSharpCode.Decompiler.Tests.exe
Tests2: ILSpy.Tests\bin\${{ matrix.configuration }}\net6.0-windows\ILSpy.Tests.exe
Tests3: ILSpy.BamlDecompiler.Tests\bin\${{ matrix.configuration }}\net6.0-windows\ILSpy.BamlDecompiler.Tests.exe
- name: Style - tab check
run: python BuildTools\tidy.py
# TODO: Replace with dotnet publish & zip
- name: Zip ILSpy Release
if: matrix.channel == 'zip'
# run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries.zip .\ILSpy\bin\${{ matrix.configuration }}\net472\*
run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries.zip .\ILSpy\bin\${{ matrix.configuration }}\net472\*.dll .\ILSpy\bin\${{ matrix.configuration }}\net472\*.exe .\ILSpy\bin\${{ matrix.configuration }}\net472\*.config .\ILSpy\bin\${{ matrix.configuration }}\net472\*\ILSpy.resources.dll .\ILSpy\bin\${{ matrix.configuration }}\net472\*\ILSpy.ReadyToRun.Plugin.resources.dll
run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries.zip .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.dll .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.exe .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.config .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*\ILSpy.resources.dll .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*\ILSpy.ReadyToRun.Plugin.resources.dll
# https://github.com/actions/upload-artifact
- name: Upload Store build artifacts
if: matrix.channel == 'store'
uses: actions/upload-artifact@v2
with:
name: MSIX Store Package
path: ${{ env.StagingDirectory }}\${{ matrix.channel }}\*.*
if-no-files-found: error
- name: Upload VSIX (VS 2019) release build artifacts
if: matrix.channel == 'zip' && matrix.configuration == 'release'
if: matrix.configuration == 'release'
uses: actions/upload-artifact@v2
with:
name: ILSpy VS Addin for VS 2017-2019 ${{ steps.version.outputs.ILSPY_VERSION_NUMBER }} (${{ matrix.configuration }})
@ -98,7 +76,7 @@ jobs: @@ -98,7 +76,7 @@ jobs:
if-no-files-found: error
- name: Upload VSIX (VS 2022) release build artifacts
if: matrix.channel == 'zip' && matrix.configuration == 'release'
if: matrix.configuration == 'release'
uses: actions/upload-artifact@v2
with:
name: ILSpy VS Addin for VS 2022 ${{ steps.version.outputs.ILSPY_VERSION_NUMBER }} (${{ matrix.configuration }})
@ -106,7 +84,7 @@ jobs: @@ -106,7 +84,7 @@ jobs:
if-no-files-found: error
- name: Upload NuGet release build artifacts
if: matrix.channel == 'zip' && matrix.configuration == 'release'
if: matrix.configuration == 'release'
uses: actions/upload-artifact@v2
with:
name: ICSharpCode.Decompiler NuGet Package (${{ matrix.configuration }})
@ -114,12 +92,11 @@ jobs: @@ -114,12 +92,11 @@ jobs:
if-no-files-found: error
- name: Publish NuGet
if: github.ref == 'refs/heads/master' && matrix.channel == 'zip' && matrix.configuration == 'release'
if: github.ref == 'refs/heads/master' && matrix.configuration == 'release'
run: |
dotnet nuget push "ICSharpCode.Decompiler\bin\Release\ICSharpCode.Decompiler*.nupkg" --api-key ${{ secrets.GITHUB_TOKEN }} --source https://nuget.pkg.github.com/${{ github.repository_owner }}
- name: Upload zip release build artifacts
if: matrix.channel == 'zip'
uses: actions/upload-artifact@v2
with:
name: ILSpy ${{ steps.version.outputs.ILSPY_VERSION_NUMBER }} (${{ matrix.configuration }})
@ -127,7 +104,7 @@ jobs: @@ -127,7 +104,7 @@ jobs:
if-no-files-found: error
- name: Upload installer artifact
if: matrix.channel == 'zip' && matrix.configuration == 'release'
if: matrix.configuration == 'release'
uses: actions/upload-artifact@v2
with:
name: ILSpy Installer ${{ steps.version.outputs.ILSPY_VERSION_NUMBER }} (${{ matrix.configuration }})

30
BuildTools/update-assemblyinfo.ps1

@ -88,11 +88,6 @@ $templateFiles = ( @@ -88,11 +88,6 @@ $templateFiles = (
@{Input="ILSpy.Installer/AppPackage.cs.template"; Output = "ILSpy.Installer/AppPackage.cs"}
);
$appxmanifestFiles = (
@{Input="ILSpy.Package/Package.appxmanifest"; Output="ILSpy.Package/Package.appxmanifest"},
@{Input="ILSpy.Package/Package-CI.appxmanifest"; Output="ILSpy.Package/Package-CI.appxmanifest"}
);
[string]$mutexId = "ILSpyUpdateAssemblyInfo" + (Get-Location).ToString().GetHashCode();
Write-Host $mutexId;
[bool]$createdNew = $false;
@ -164,31 +159,6 @@ try { @@ -164,31 +159,6 @@ try {
$out | Out-File -Encoding utf8 $file.Output;
}
}
# Only update these on the Build Agent when ReleaseChannel is set
if($Env:ReleaseChannel -ne '' -and $Env:ReleaseChannel -ne $null) {
foreach ($file in $appxmanifestFiles) {
[string]$in = (Get-Content $file.Input) -Join [System.Environment]::NewLine;
$out = $in.Replace('$INSERTVERSION$', $fullVersionNumber);
$out = $out.Replace('$INSERTMAJORVERSION$', $major);
$out = $out.Replace('$INSERTMINORVERSION$', $minor);
$out = $out.Replace('$INSERTREVISION$', $revision);
$out = $out.Replace('$INSERTCOMMITHASH$', $gitCommitHash);
$out = $out.Replace('$INSERTSHORTCOMMITHASH$', $gitCommitHash.Substring(0, 8));
$out = $out.Replace('$INSERTDATE$', [System.DateTime]::Now.ToString("MM/dd/yyyy"));
$out = $out.Replace('$INSERTYEAR$', [System.DateTime]::Now.Year.ToString());
$out = $out.Replace('$INSERTBRANCHNAME$', $branchName);
$out = $out.Replace('$INSERTBRANCHPOSTFIX$', $postfixBranchName);
$out = $out.Replace('$INSERTVERSIONNAME$', $versionName);
$out = $out.Replace('$INSERTVERSIONNAMEPOSTFIX$', $postfixVersionName);
$out = $out.Replace('$INSERTBUILDCONFIG$', $buildConfig);
if ((-not (Test-File $file.Output)) -or (((Get-Content $file.Output) -Join [System.Environment]::NewLine) -ne $out)) {
$out | Out-File -Encoding utf8 $file.Output;
}
}
}
} finally {
$mutex.ReleaseMutex();

Loading…
Cancel
Save