Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

fix: add self contained app sdk#156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
ibetitsmike merged 2 commits intomainfrommike/load-crash-fix
Sep 23, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions.github/workflows/ci.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,6 @@ jobs:
dotnet-version: 8.0.x
cache: true
cache-dependency-path: '**/packages.lock.json'
- name: Install Windows App SDK Runtime
shell: pwsh
run: |
$ErrorActionPreference = "Stop"

$filename = ".\WindowsAppRuntimeInstall-x64.exe"
$url = "https://aka.ms/windowsappsdk/1.8/1.8.250907003/windowsappruntimeinstall-x64.exe" # 1.8.0 (1.8.250907003)
& curl.exe --progress-bar --show-error --fail --location --output $filename $url
if ($LASTEXITCODE -ne 0) { throw "Failed to download Windows App SDK" }

$process = Start-Process -FilePath $filename -ArgumentList "--quiet --force" -NoNewWindow -Wait -PassThru
if ($process.ExitCode -ne 0) { throw "Failed to install Windows App SDK: exit code is $($process.ExitCode)" }
- name: dotnet restore
run: dotnet restore --locked-mode
- name: dotnet test
Expand Down
3 changes: 2 additions & 1 deletionApp/App.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
Expand DownExpand Up@@ -27,6 +27,7 @@
<Copyright>© Coder Technologies Inc.</Copyright>
<ApplicationIcon>coder.ico</ApplicationIcon>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
</PropertyGroup>

<PropertyGroup Condition="$(Configuration) == 'Release'">
Expand Down
27 changes: 0 additions & 27 deletionsInstaller/Program.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,9 +116,6 @@ public class BootstrapperOptions : SharedOptions
[Option('m', "msi-path", Required = true, HelpText = "Path to the MSI package to embed")]
public string MsiPath { get; set; }

[Option('w', "windows-app-sdk-path", Required = true, HelpText = "Path to the Windows App Sdk package to embed")]
public string WindowsAppSdkPath { get; set; }

[Option('t', "theme-xml-path", Required = false, HelpText = "Path to the theme .xml file to use for the installer")]
public string ThemeXmlPath { get; set; }

Expand All@@ -130,9 +127,6 @@ public class BootstrapperOptions : SharedOptions
throw new ArgumentException($"Logo PNG file not found at '{LogoPng}'", nameof(LogoPng));
if (!SystemFile.Exists(MsiPath))
throw new ArgumentException($"MSI package not found at '{MsiPath}'", nameof(MsiPath));
if (!SystemFile.Exists(WindowsAppSdkPath))
throw new ArgumentException($"Windows App Sdk package not found at '{WindowsAppSdkPath}'",
nameof(WindowsAppSdkPath));
if (ThemeXmlPath != null && !SystemFile.Exists(ThemeXmlPath))
throw new ArgumentException($"Theme XML file not found at '{ThemeXmlPath}'", nameof(ThemeXmlPath));
}
Expand DownExpand Up@@ -374,27 +368,6 @@ private static int BuildBundle(BootstrapperOptions opts)
Vital = false,
Payloads = [dotNetRuntimePayload],
},
// TODO: right now we are including the Windows App Sdk in the bundle
// and always install it
// Microsoft makes it difficult to check if it exists from a regular installer:
// https://learn.microsoft.com/en-us/windows/apps/windows-app-sdk/check-windows-app-sdk-versions
// https://github.com/microsoft/WindowsAppSDK/discussions/2437
new ExePackage // Windows App Sdk
{
PerMachine = true,
Permanent = true,
Cache = PackageCacheAction.remove,
// There is no license agreement for this SDK.
InstallArguments = "--quiet",
Vital = false,
Payloads =
[
new ExePackagePayload
{
SourceFile = opts.WindowsAppSdkPath,
},
],
},
new MsiPackage(opts.MsiPath)
{
ForcePerMachine = true,
Expand Down
35 changes: 0 additions & 35 deletionsscripts/Get-WindowsAppSdk.ps1
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletionsscripts/Publish.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ $servicePublishDir = Join-Path $buildPath "service"
& dotnet.exe publish .\Vpn.Service\Vpn.Service.csproj -c Release -a $arch -o $servicePublishDir /p:Version=$version
if ($LASTEXITCODE -ne 0) { throw "Failed to build Vpn.Service" }
# App needs to be built with msbuild
$appPublishDir = Join-Path $buildPath "app"
$appPublishDir = Join-Path $buildPath "app\"
$msbuildBinary = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
if ($LASTEXITCODE -ne 0) { throw "Failed to find MSBuild" }
if (-not (Test-Path $msbuildBinary)) { throw "Failed to find MSBuild at $msbuildBinary" }
Expand DownExpand Up@@ -175,10 +175,6 @@ Copy-Item $mutagenAgentsSrcPath $mutagenAgentsDestPath
if ($LASTEXITCODE -ne 0) { throw "Failed to build MSI" }
Add-CoderSignature $msiOutputPath

$getWindowsAppSdk = Join-Path $scriptRoot "Get-WindowsAppSdk.ps1"
& $getWindowsAppSdk -arch $arch
$windowsAppSdkPath = Join-Path $scriptRoot "files\windows-app-sdk-$($arch).exe"

# Build the bootstrapper
& dotnet.exe run --project .\Installer\Installer.csproj -c Release -- `
build-bootstrapper `
Expand All@@ -188,7 +184,6 @@ $windowsAppSdkPath = Join-Path $scriptRoot "files\windows-app-sdk-$($arch).exe"
--output-path $outputPath `
--icon-file "App\coder.ico" `
--msi-path $msiOutputPath `
--windows-app-sdk-path $windowsAppSdkPath `
--theme-xml-path "scripts\files\RtfThemeLarge.xml" `
--logo-png "scripts\files\logo.png"
if ($LASTEXITCODE -ne 0) { throw "Failed to build bootstrapper" }
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp