Skip to content

Commit 3849b8d

Browse files
committed
fix: Build
1 parent 166dcd4 commit 3849b8d

4 files changed

Lines changed: 15 additions & 7 deletions

File tree

.github/workflows/windows.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,29 @@ jobs:
4545
shell: pwsh
4646
run: echo "${{ steps.msys2.outputs.msys2-location }}\${{ matrix.variant.subsys }}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
4747
- name: "Restore"
48-
run: dotnet restore ${{ env.PROJECT_NAME }} --runtime win-${{ matrix.variant.arch }} /p:PublishReadyToRun=true
48+
run: |
49+
$vsInstallPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath
50+
Import-Module "$vsInstallPath\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
51+
Enter-VsDevShell -VsInstallPath $vsInstallPath -SkipAutomaticLocation
52+
dotnet restore ${{ env.PROJECT_NAME }} --runtime win-${{ matrix.variant.arch }} /p:PublishReadyToRun=true
4953
- name: "Publish"
50-
run: dotnet publish ${{ env.PROJECT_NAME }} -c Release --no-restore --runtime win-${{ matrix.variant.arch }} /p:Platform=${{ matrix.variant.arch }}
54+
run: |
55+
$vsInstallPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath
56+
Import-Module "$vsInstallPath\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
57+
Enter-VsDevShell -VsInstallPath $vsInstallPath -SkipAutomaticLocation
58+
dotnet publish ${{ env.PROJECT_NAME }} -c Release --no-restore --runtime win-${{ matrix.variant.arch }} /p:Platform=${{ matrix.variant.arch }}
5159
- name: "Installer"
5260
working-directory: ${{github.workspace}}/inno
5361
env:
54-
APP_FILES_PATH: ${{ env.PROJECT_NAME }}/bin/${{ matrix.variant.arch }}/Release/net10.0-windows10.0.22621.0/win-${{ matrix.variant.arch }}/publish
62+
APP_FILES_PATH: ${{ env.PROJECT_NAME }}/bin/${{ matrix.variant.arch }}/Release/net10.0-windows10.0.19041.0/win-${{ matrix.variant.arch }}/publish
5563
shell: pwsh
5664
run: |
5765
$ProgressPreference = 'SilentlyContinue'
5866
iscc setup.iss
5967
- name: "Portable"
6068
shell: pwsh
6169
run: |
62-
$publishDir = "${{ env.PROJECT_NAME }}\bin\${{ matrix.variant.arch }}\Release\net10.0-windows10.0.22621.0\win-${{ matrix.variant.arch }}\publish"
70+
$publishDir = "${{ env.PROJECT_NAME }}\bin\${{ matrix.variant.arch }}\Release\net10.0-windows10.0.19041.0\win-${{ matrix.variant.arch }}\publish"
6371
$portableDir = "${{ github.workspace }}\portable"
6472
New-Item -ItemType Directory -Force -Path "$portableDir\Release" | Out-Null
6573
Copy-Item -Path "$publishDir\*" -Destination "$portableDir\Release" -Recurse

Nickvision.Application.GNOME/Nickvision.Application.GNOME.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework Condition="$([MSBuild]::IsOSPlatform('Windows'))">net10.0-windows10.0.22621.0</TargetFramework>
4+
<TargetFramework Condition="$([MSBuild]::IsOSPlatform('Windows'))">net10.0-windows10.0.19041.0</TargetFramework>
55
<TargetFramework Condition="!$([MSBuild]::IsOSPlatform('Windows'))">net10.0</TargetFramework>
66
<LangVersion>latest</LangVersion>
77
<ImplicitUsings>disable</ImplicitUsings>

Nickvision.Application.Shared/Nickvision.Application.Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework Condition="$([MSBuild]::IsOSPlatform('Windows'))">net10.0-windows10.0.22621.0</TargetFramework>
4+
<TargetFramework Condition="$([MSBuild]::IsOSPlatform('Windows'))">net10.0-windows10.0.19041.0</TargetFramework>
55
<TargetFramework Condition="!$([MSBuild]::IsOSPlatform('Windows'))">net10.0</TargetFramework>
66
<LangVersion>latest</LangVersion>
77
<ImplicitUsings>disable</ImplicitUsings>

Nickvision.Application.WinUI/Nickvision.Application.WinUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net10.0-windows10.0.22621.0</TargetFramework>
4+
<TargetFramework>net10.0-windows10.0.19041.0</TargetFramework>
55
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
66
<LangVersion>latest</LangVersion>
77
<ImplicitUsings>disable</ImplicitUsings>

0 commit comments

Comments
 (0)