diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml index 4fb9375c24..7caec6d41a 100644 --- a/.github/workflows/ci-suite.yml +++ b/.github/workflows/ci-suite.yml @@ -951,11 +951,6 @@ jobs: runs-on: windows-latest if: "!(cancelled() || failure()) && needs.start-ci-run-gate.result == 'success'" steps: - - name: Setup dotnet - uses: actions/setup-dotnet@v2 - with: - dotnet-version: ${{ env.TGS_DOTNET_VERSION }} - - name: Setup VS Dev Environment uses: seanmiddleditch/gha-setup-vsdevenv@v4 diff --git a/build/package/winget/build_package.ps1 b/build/package/winget/build_package.ps1 index eece34452f..22db5bb83f 100644 --- a/build/package/winget/build_package.ps1 +++ b/build/package/winget/build_package.ps1 @@ -13,15 +13,13 @@ Remove-Item -Recurse -Force .git [XML]$versionXML = Get-Content build/Version.props $tgsVersion = $versionXML.Project.PropertyGroup.TgsCoreVersion +cd build/package/winget + $devProductCode = 'D24887FA-3228-4509-B5F3-4E07E349F278' $devVersion = '0.22.475' -(Get-Content build/package/winget/Tgstation.Server.Host.Service.Msi/Tgstation.Server.Host.Service.Msi.vdproj).Replace($devVersion, $tgsVersion) | Set-Content build/package/winget/Tgstation.Server.Host.Service.Msi/Tgstation.Server.Host.Service.Msi.vdproj -(Get-Content build/package/winget/Tgstation.Server.Host.Service.Msi/Tgstation.Server.Host.Service.Msi.vdproj).Replace($devProductCode, [guid]::NewGuid().ToString().ToUpperInvariant()) | Set-Content build/package/winget/Tgstation.Server.Host.Service.Msi/Tgstation.Server.Host.Service.Msi.vdproj - -dotnet restore -cd build/package/winget -dotnet build -c Release Tgstation.Server.Host.Service.Configure +(Get-Content Tgstation.Server.Host.Service.Msi/Tgstation.Server.Host.Service.Msi.vdproj).Replace($devVersion, $tgsVersion) | Set-Content Tgstation.Server.Host.Service.Msi/Tgstation.Server.Host.Service.Msi.vdproj +(Get-Content Tgstation.Server.Host.Service.Msi/Tgstation.Server.Host.Service.Msi.vdproj).Replace($devProductCode, [guid]::NewGuid().ToString().ToUpperInvariant()) | Set-Content Tgstation.Server.Host.Service.Msi/Tgstation.Server.Host.Service.Msi.vdproj # We make _some_ assumptions DevEnv installer.sln /Project Tgstation.Server.Host.Service.Msi/Tgstation.Server.Host.Service.Msi.vdproj /build Release