Browse Source

Fix #2984: Store pointing to v8.0 submission, building of arm64 setup

pull/3003/head
Christoph Wille 2 years ago
parent
commit
f12a3d3572
  1. 17
      .github/workflows/build-ilspy.yml
  2. 4
      ILSpy.Installer/ILSpy.Installer.csproj
  3. 2
      ILSpy.Installer/setup.cs
  4. 2
      README.md

17
.github/workflows/build-ilspy.yml

@ -90,11 +90,12 @@ jobs: @@ -90,11 +90,12 @@ jobs:
if: matrix.configuration == 'release'
run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries_arm64.zip .\ILSpy\bin\Release\net6.0-windows\win-arm64\publish\fwdependent\*
- name: Build Installer (x64 framework-dependent)
- name: Build Installer (x64 and arm64, framework-dependent)
if: matrix.configuration == 'release'
run: |
msbuild ILSpy.Installer.sln /t:Restore /p:Configuration="Release" /p:Platform="Any CPU"
msbuild ILSpy.Installer.sln /p:Configuration="Release" /p:Platform="Any CPU"
msbuild ILSpy.Installer.sln /p:Configuration="Release" /p:Platform="Any CPU" /p:DefineConstants="ARM64"
# https://github.com/actions/upload-artifact
- name: Upload VSIX (VS 2019) release build artifacts
@ -162,12 +163,20 @@ jobs: @@ -162,12 +163,20 @@ jobs:
path: ${{ env.StagingDirectory }}\ILSpy_binaries_arm64.zip
if-no-files-found: error
- name: Upload installer artifact
- name: Upload x64 installer artifact
if: matrix.configuration == 'release'
uses: actions/upload-artifact@v3
with:
name: ILSpy Installer ${{ steps.version.outputs.ILSPY_VERSION_NUMBER }} (${{ matrix.configuration }})
path: ILSpy.Installer\wix\*.msi
name: ILSpy Installer x64 ${{ steps.version.outputs.ILSPY_VERSION_NUMBER }} (${{ matrix.configuration }})
path: ILSpy.Installer\wix\*-x64.msi
if-no-files-found: error
- name: Upload arm64 installer artifact
if: matrix.configuration == 'release'
uses: actions/upload-artifact@v3
with:
name: ILSpy Installer arm64 ${{ steps.version.outputs.ILSPY_VERSION_NUMBER }} (${{ matrix.configuration }})
path: ILSpy.Installer\wix\*-arm64.msi
if-no-files-found: error
- name: Upload ilspycmd release build artifacts

4
ILSpy.Installer/ILSpy.Installer.csproj

@ -7,8 +7,8 @@ @@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="WixSharp" Version="1.20.3" />
<PackageReference Include="WixSharp.wix.bin" Version="3.11.2" />
<PackageReference Include="WixSharp" Version="1.20.4" />
<PackageReference Include="WixSharp.wix.bin" Version="3.14.0" />
</ItemGroup>
<ItemGroup>

2
ILSpy.Installer/setup.cs

@ -38,8 +38,6 @@ namespace ILSpy.Installer @@ -38,8 +38,6 @@ namespace ILSpy.Installer
#if ARM64
project.Platform = Platform.arm64;
// https://github.com/oleg-shilo/wixsharp/issues/1296#issuecomment-1575523854 3.11.2 won't do, need 3.14
// Compiler.WixLocation = @"D:\GitWorkspace\_wix314-binaries";
#else
project.Platform = Platform.x64;
#endif

2
README.md

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
ILSpy is the open-source .NET assembly browser and decompiler.
Download: [latest release](https://github.com/icsharpcode/ILSpy/releases) | [latest CI build (master)](https://github.com/icsharpcode/ILSpy/actions?query=workflow%3A%22Build+ILSpy%22+branch%3Amaster+is%3Asuccess+event%3Apush) | [Microsoft Store (RC & RTM versions only)](https://www.microsoft.com/store/apps/9MXFBKFVSQ13)
Download: [latest release](https://github.com/icsharpcode/ILSpy/releases) | [latest CI build (master)](https://github.com/icsharpcode/ILSpy/actions?query=workflow%3A%22Build+ILSpy%22+branch%3Amaster+is%3Asuccess+event%3Apush) | [Microsoft Store (RTM versions only)](https://apps.microsoft.com/store/detail/ilspy-fresh/XP8C26VDWLP4T4)
Decompiler Frontends
-------

Loading…
Cancel
Save