Skip to content

Fix build and sync #3

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
dkbennett merged 2 commits into from
Mar 20, 2025
Merged

Fix build and sync #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9aa0334
Fix build
dkbennett Mar 20, 2025
724662d
Update syncmirror
dkbennett Mar 20, 2025
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
6 changes: 3 additions & 3 deletions build/SyncMirroredRepository.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extends:
roslyn:
enabled: true
arrow:
serviceConnection: WindowsAdvancedSettings Build VM Generation
serviceConnection: DevHome Build VM Generation
pool:
name: Azure-Pipelines-1ESPT-ExDShared
image: windows-2022
Expand All @@ -31,8 +31,8 @@ extends:
steps:
- task: AzureKeyVault@1
inputs:
azureSubscription: 'WindowsAdvancedSettingsAzureServiceConnection'
KeyVaultName: 'WindowsAdvancedSettingsKeyVault'
azureSubscription: 'DevHomeAzureServiceConnection'
KeyVaultName: 'DevHomeKeyVault'
SecretsFilter: 'GitHubPAT'
RunAsPreJob: false

Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Try {

if (($BuildStep -ieq "all") -Or ($BuildStep -ieq "msixbundle")) {
foreach ($configuration in $env:Build_Configuration.Split(",")) {
.\build\scripts\Create-AppxBundle.ps1 -InputPath (Join-Path $env:Build_RootDirectory "AppxPackages\$configuration") -ProjectName AzureExtension -BundleVersion ([version]$env:msix_version) -OutputPath (Join-Path $env:Build_RootDirectory ("AppxBundles\$configuration\WindowsAdvancedSettings_" + $env:msix_version + "_8wekyb3d8bbwe.msixbundle"))
.\build\scripts\Create-AppxBundle.ps1 -InputPath (Join-Path $env:Build_RootDirectory "AppxPackages\$configuration") -ProjectName WindowsAdvancedSettings -BundleVersion ([version]$env:msix_version) -OutputPath (Join-Path $env:Build_RootDirectory ("AppxBundles\$configuration\WindowsAdvancedSettings_" + $env:msix_version + "_8wekyb3d8bbwe.msixbundle"))
if (-not($IsAzurePipelineBuild) -And $isAdmin) {
# This can fail if SignTool.exe is not found, which is part of the Windows SDK.
Invoke-SignPackage ("AppxBundles\$configuration\WindowsAdvancedSettings_" + $env:msix_version + "_8wekyb3d8bbwe.msixbundle")
Expand Down
14 changes: 4 additions & 10 deletions src/AdvancedSettings/Package-Dev.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:genTemplate="http://schemas.microsoft.com/appx/developer/templatestudio" xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10" xmlns:com2="http://schemas.microsoft.com/appx/manifest/com/windows10/2" xmlns:com3="http://schemas.microsoft.com/appx/manifest/com/windows10/3" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6" IgnorableNamespaces="uap uap3 uap5 uap10 genTemplate">
<Identity Name="Microsoft.Windows.DevHome.Dev" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="0.0.0.0" />
<Identity Name="Microsoft.Windows.DevHome.Dev" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="0.2199.805.1959" />
<Properties>
<DisplayName>Windows Advanced Settings (Dev)</DisplayName>
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
Expand Down Expand Up @@ -44,20 +44,14 @@
</Extensions>
</Application>
<Application Id="App2" Executable="AdvancedSettings.Tester.exe" EntryPoint="Windows.FullTrustApplication">
<uap3:VisualElements
BackgroundColor="transparent"
DisplayName="AdvancedSettings Tester"
Square150x150Logo="Assets\Square150x150Logo.scale-200.png"
Square44x44Logo="Assets\Square44x44Logo.scale-200.png"
Description="AdvancedSettings Tester CommandLine"
VisualGroup="AdvancedSettings">
<uap3:VisualElements BackgroundColor="transparent" DisplayName="AdvancedSettings Tester" Square150x150Logo="Assets\Square150x150Logo.scale-200.png" Square44x44Logo="Assets\Square44x44Logo.scale-200.png" Description="AdvancedSettings Tester CommandLine" VisualGroup="AdvancedSettings">
<uap:SplashScreen BackgroundColor="transparent" Image="Assets\SplashScreen.scale-200.png" />
<uap:DefaultTile/>
<uap:DefaultTile />
</uap3:VisualElements>
<Extensions>
<uap3:Extension Category="windows.appExecutionAlias">
<uap3:AppExecutionAlias>
<desktop:ExecutionAlias Alias="wastester.exe"/>
<desktop:ExecutionAlias Alias="wastester.exe" />
</uap3:AppExecutionAlias>
</uap3:Extension>
</Extensions>
Expand Down