diff --git a/build/pipelines/azure-pipelines.ci-internal.yaml b/build/pipelines/azure-pipelines.ci-internal.yaml
index 57c972dd..150bdd83 100644
--- a/build/pipelines/azure-pipelines.ci-internal.yaml
+++ b/build/pipelines/azure-pipelines.ci-internal.yaml
@@ -49,4 +49,4 @@ jobs:
parameters:
platform: x86
-- template: ./templates/package-appxbundle.yaml
+- template: ./templates/package-msixbundle.yaml
diff --git a/build/pipelines/azure-pipelines.ci.yaml b/build/pipelines/azure-pipelines.ci.yaml
index f21dd59f..f7ead2a4 100644
--- a/build/pipelines/azure-pipelines.ci.yaml
+++ b/build/pipelines/azure-pipelines.ci.yaml
@@ -48,4 +48,4 @@ jobs:
parameters:
platform: x86
-- template: ./templates/package-appxbundle.yaml
+- template: ./templates/package-msixbundle.yaml
diff --git a/build/pipelines/azure-pipelines.release.yaml b/build/pipelines/azure-pipelines.release.yaml
index b95543d5..cd5015b4 100644
--- a/build/pipelines/azure-pipelines.release.yaml
+++ b/build/pipelines/azure-pipelines.release.yaml
@@ -44,7 +44,7 @@ jobs:
parameters:
platform: x86
-- template: ./templates/package-appxbundle.yaml
+- template: ./templates/package-msixbundle.yaml
parameters:
signBundle: true
createStoreBrokerPackages: true
diff --git a/build/pipelines/templates/build-single-architecture.yaml b/build/pipelines/templates/build-single-architecture.yaml
index f2420197..3fa67a5d 100644
--- a/build/pipelines/templates/build-single-architecture.yaml
+++ b/build/pipelines/templates/build-single-architecture.yaml
@@ -11,7 +11,7 @@ jobs:
displayName: Build ${{ parameters.platform }}
condition: ${{ parameters.condition }}
pool:
- vmImage: windows-2019
+ vmImage: windows-2022
variables:
BuildConfiguration: Release
BuildPlatform: ${{ parameters.platform }}
@@ -64,7 +64,7 @@ jobs:
displayName: 'Build solution src/Calculator.sln'
inputs:
solution: src/Calculator.sln
- vsVersion: 16.0
+ vsVersion: 17.0
msbuildArgs: /bl:$(Build.BinariesDirectory)\$(BuildConfiguration)\$(BuildPlatform)\Calculator.binlog /p:OutDir=$(Build.BinariesDirectory)\$(BuildConfiguration)\$(BuildPlatform)\ /p:GenerateProjectSpecificOutputFolder=true /p:Version=$(Build.BuildNumber) /t:Publish /p:PublishDir=$(Build.BinariesDirectory)\$(BuildConfiguration)\$(BuildPlatform)\publish\ $(ExtraMSBuildArgs)
platform: $(BuildPlatform)
configuration: $(BuildConfiguration)
diff --git a/build/pipelines/templates/package-appxbundle.yaml b/build/pipelines/templates/package-msixbundle.yaml
similarity index 78%
rename from build/pipelines/templates/package-appxbundle.yaml
rename to build/pipelines/templates/package-msixbundle.yaml
index dccd3dea..acc095d5 100644
--- a/build/pipelines/templates/package-appxbundle.yaml
+++ b/build/pipelines/templates/package-msixbundle.yaml
@@ -1,5 +1,5 @@
-# This template contains a job which takes .appx packages which were built separately for each
-# architecture (arm, x86, etc.) and combines them into a single .appxbundle. In release builds,
+# This template contains a job which takes .msix packages which were built separately for each
+# architecture (arm, x86, etc.) and combines them into a single .msixbundle. In release builds,
# this job also signs the bundle and creates StoreBroker packages.
parameters:
@@ -20,7 +20,7 @@ jobs:
in(dependencies.BuildARM.result, 'Succeeded', 'SucceededWithIssues', 'Skipped')
)
pool:
- vmImage: windows-2019
+ vmImage: windows-2022
variables:
skipComponentGovernanceDetection: true
StoreBrokerMediaRootPath: $(TEMP)\SBMedia
@@ -30,10 +30,10 @@ jobs:
fetchDepth: 1
- task: DownloadBuildArtifacts@0
- displayName: Download all .appx artifacts
+ displayName: Download all .msix artifacts
inputs:
artifactName: drop
- itemPattern: '**/*.appx'
+ itemPattern: '**/*.msix'
- ${{ if eq(parameters.createStoreBrokerPackages, true) }}:
- task: UniversalPackages@0
@@ -46,41 +46,41 @@ jobs:
vstsPackageVersion: 0.0.67
- task: PowerShell@2
- displayName: Generate AppxBundle mapping
+ displayName: Generate MsixBundle mapping
inputs:
- filePath: $(Build.SourcesDirectory)\build\scripts\CreateAppxBundleMapping.ps1
- arguments: '-InputPath $(Build.ArtifactStagingDirectory)\drop\Release -ProjectName Calculator -OutputFile $(Build.BinariesDirectory)\AppxBundleMapping.txt'
+ filePath: $(Build.SourcesDirectory)\build\scripts\CreateMsixBundleMapping.ps1
+ arguments: '-InputPath $(Build.ArtifactStagingDirectory)\drop\Release -ProjectName Calculator -OutputFile $(Build.BinariesDirectory)\MsixBundleMapping.txt'
- powershell: |
$buildVersion = [version]$Env:BUILDVERSION
$bundleVersion = "2021.$($buildVersion.Minor).$($buildVersion.Build).$($buildVersion.Revision)"
- & "C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x86\MakeAppx.exe" bundle /v /bv $bundleVersion /f $Env:MAPPINGFILEPATH /p $Env:OUTPUTPATH
- displayName: Make AppxBundle
+ & "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64\MakeAppx.exe" bundle /v /bv $bundleVersion /f $Env:MAPPINGFILEPATH /p $Env:OUTPUTPATH
+ displayName: Make MsixBundle
env:
BUILDVERSION: $(Build.BuildNumber)
- MAPPINGFILEPATH: $(Build.BinariesDirectory)\AppxBundleMapping.txt
- OUTPUTPATH: $(Build.BinariesDirectory)\Microsoft.WindowsCalculator_8wekyb3d8bbwe.appxbundle
+ MAPPINGFILEPATH: $(Build.BinariesDirectory)\MsixBundleMapping.txt
+ OUTPUTPATH: $(Build.BinariesDirectory)\Microsoft.WindowsCalculator_8wekyb3d8bbwe.msixbundle
- task: CopyFiles@2
- displayName: Copy AppxBundle to staging directory
+ displayName: Copy MsixBundle to staging directory
inputs:
sourceFolder: $(Build.BinariesDirectory)
- contents: Microsoft.WindowsCalculator_8wekyb3d8bbwe.appxbundle
- targetFolder: $(Build.ArtifactStagingDirectory)\appxBundle
+ contents: Microsoft.WindowsCalculator_8wekyb3d8bbwe.msixbundle
+ targetFolder: $(Build.ArtifactStagingDirectory)\msixBundle
- task: PublishBuildArtifacts@1
- displayName: Publish AppxBundle artifact
+ displayName: Publish MsixBundle artifact
inputs:
- artifactName: appxBundle
- pathToPublish: $(Build.ArtifactStagingDirectory)\appxBundle
+ artifactName: msixBundle
+ pathToPublish: $(Build.ArtifactStagingDirectory)\msixBundle
- ${{ if eq(parameters.signBundle, true) }}:
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
- displayName: Send appxbundle to code signing service
+ displayName: Send msixbundle to code signing service
inputs:
ConnectedServiceName: Essential Experiences Codesign
- FolderPath: $(Build.ArtifactStagingDirectory)\appxBundle
- Pattern: Microsoft.WindowsCalculator_8wekyb3d8bbwe.appxbundle
+ FolderPath: $(Build.ArtifactStagingDirectory)\msixBundle
+ Pattern: Microsoft.WindowsCalculator_8wekyb3d8bbwe.msixbundle
signConfigType: inlineSignParams
inlineOperation: |
[
@@ -109,10 +109,10 @@ jobs:
}
]
- task: PublishBuildArtifacts@1
- displayName: Publish AppxBundleSigned artifact
+ displayName: Publish MsixBundleSigned artifact
inputs:
- pathtoPublish: $(Build.ArtifactStagingDirectory)\appxBundle
- artifactName: appxBundleSigned
+ pathtoPublish: $(Build.ArtifactStagingDirectory)\msixBundle
+ artifactName: msixBundleSigned
- ${{ if eq(parameters.createStoreBrokerPackages, true) }}:
- powershell: |
@@ -139,8 +139,8 @@ jobs:
inputs:
serviceEndpoint: Calculator StoreBroker Connection
sbConfigPath: Tools/Build/StoreBroker/SBCalculatorConfig.json
- sourceFolder: $(Build.ArtifactStagingDirectory)/appxBundle
- contents: Microsoft.WindowsCalculator_8wekyb3d8bbwe.appxbundle
+ sourceFolder: $(Build.ArtifactStagingDirectory)/msixBundle
+ contents: Microsoft.WindowsCalculator_8wekyb3d8bbwe.msixbundle
pdpPath: $(Build.SourcesDirectory)\PDP
pdpInclude: PDP.xml
pdpMediaPath: $(StoreBrokerMediaRootPath)
diff --git a/build/pipelines/templates/release-store.yaml b/build/pipelines/templates/release-store.yaml
index fe7d8755..65ec4ca7 100644
--- a/build/pipelines/templates/release-store.yaml
+++ b/build/pipelines/templates/release-store.yaml
@@ -4,7 +4,7 @@ jobs:
- job: ReleaseStore
dependsOn: Package
pool:
- vmImage: windows-2019
+ vmImage: windows-2022
variables:
skipComponentGovernanceDetection: true
StoreBrokerPackagePath: $(Build.ArtifactStagingDirectory)\storeBrokerPayload
diff --git a/build/pipelines/templates/release-vpack.yaml b/build/pipelines/templates/release-vpack.yaml
index aac7fbb6..699ea9b7 100644
--- a/build/pipelines/templates/release-vpack.yaml
+++ b/build/pipelines/templates/release-vpack.yaml
@@ -5,30 +5,30 @@ jobs:
- job: ReleaseVPack
dependsOn: Package
pool:
- vmImage: windows-2019
+ vmImage: windows-2022
variables:
skipComponentGovernanceDetection: true
steps:
- checkout: none
- task: DownloadBuildArtifacts@0
- displayName: Download appxBundleSigned artifact
+ displayName: Download msixBundleSigned artifact
inputs:
- artifactName: appxBundleSigned
+ artifactName: msixBundleSigned
- task: CopyFiles@2
- displayName: Copy signed AppxBundle to vpack staging folder
+ displayName: Copy signed MsixBundle to vpack staging folder
inputs:
- sourceFolder: $(Build.ArtifactStagingDirectory)\appxBundleSigned
- contents: Microsoft.WindowsCalculator_8wekyb3d8bbwe.appxbundle
- targetFolder: $(Build.ArtifactStagingDirectory)\vpack\appxBundle
+ sourceFolder: $(Build.ArtifactStagingDirectory)\msixBundleSigned
+ contents: Microsoft.WindowsCalculator_8wekyb3d8bbwe.msixbundle
+ targetFolder: $(Build.ArtifactStagingDirectory)\vpack\msixBundle
- task: PkgESVPack@12
displayName: Create and push vpack for app
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
inputs:
- sourceDirectory: $(Build.ArtifactStagingDirectory)\vpack\appxBundle
+ sourceDirectory: $(Build.ArtifactStagingDirectory)\vpack\msixBundle
description: VPack for the Calculator Application
pushPkgName: calculator.app
version: $(versionMajor).$(versionMinor).$(versionBuild)
diff --git a/build/pipelines/templates/run-ui-tests.yaml b/build/pipelines/templates/run-ui-tests.yaml
index 347a3a8b..0f93d160 100644
--- a/build/pipelines/templates/run-ui-tests.yaml
+++ b/build/pipelines/templates/run-ui-tests.yaml
@@ -10,7 +10,7 @@ jobs:
dependsOn: Build${{ parameters.platform }}
condition: succeeded()
pool:
- vmImage: windows-2019
+ vmImage: windows-2022
variables:
skipComponentGovernanceDetection: true
steps:
@@ -21,7 +21,7 @@ jobs:
continueOnError: true
- task: DownloadBuildArtifacts@0
- displayName: Download AppxBundle and CalculatorUITests
+ displayName: Download MsixBundle and CalculatorUITests
inputs:
artifactName: drop
itemPattern: |
@@ -44,7 +44,7 @@ jobs:
displayName: Run CalculatorUITests
inputs:
testAssemblyVer2: $(Build.ArtifactStagingDirectory)/drop/Release/${{ parameters.platform }}/publish/CalculatorUITests.dll
- vsTestVersion: 16.0
+ vsTestVersion: 17.0
runSettingsFile: $(Build.ArtifactStagingDirectory)/drop/Release/${{ parameters.platform }}/publish/${{ parameters.runsettingsFileName }}
platform: ${{ parameters.platform }}
configuration: Release
diff --git a/build/pipelines/templates/run-unit-tests.yaml b/build/pipelines/templates/run-unit-tests.yaml
index 56f60969..5a0ff532 100644
--- a/build/pipelines/templates/run-unit-tests.yaml
+++ b/build/pipelines/templates/run-unit-tests.yaml
@@ -10,7 +10,7 @@ jobs:
dependsOn: Build${{ parameters.platform }}
condition: succeeded()
pool:
- vmImage: windows-2019
+ vmImage: windows-2022
variables:
skipComponentGovernanceDetection: true
steps:
@@ -31,5 +31,5 @@ jobs:
- task: VSTest@2
displayName: Run CalculatorUnitTests
inputs:
- testAssemblyVer2: $(Build.ArtifactStagingDirectory)\drop\Release\${{ parameters.platform }}\CalculatorUnitTests\AppPackages\CalculatorUnitTests_Test\CalculatorUnitTests.appx
+ testAssemblyVer2: $(Build.ArtifactStagingDirectory)\drop\Release\${{ parameters.platform }}\CalculatorUnitTests\AppPackages\CalculatorUnitTests_Test\CalculatorUnitTests.msix
otherConsoleOptions: /Platform:${{ parameters.platform }}
\ No newline at end of file
diff --git a/src/CalcManager/CalcManager.vcxproj b/src/CalcManager/CalcManager.vcxproj
index 80940c6a..7df97dba 100644
--- a/src/CalcManager/CalcManager.vcxproj
+++ b/src/CalcManager/CalcManager.vcxproj
@@ -45,8 +45,8 @@
true
Windows Store
10.0
- 10.0.18362.0
- 10.0.17134.0
+ 10.0.22000.0
+ 10.0.17763.0
@@ -56,28 +56,28 @@
StaticLibrary
true
- v142
+ v143
StaticLibrary
true
- v142
+ v143
StaticLibrary
true
- v142
+ v143
StaticLibrary
true
- v142
+ v143
StaticLibrary
false
true
- v142
+ v143
NativeRecommendedRules.ruleset
true
@@ -85,7 +85,7 @@
StaticLibrary
false
true
- v142
+ v143
NativeRecommendedRules.ruleset
true
@@ -93,7 +93,7 @@
StaticLibrary
false
true
- v142
+ v143
NativeRecommendedRules.ruleset
true
@@ -101,7 +101,7 @@
StaticLibrary
false
true
- v142
+ v143
NativeRecommendedRules.ruleset
true
diff --git a/src/CalcViewModel/CalcViewModel.vcxproj b/src/CalcViewModel/CalcViewModel.vcxproj
index 7ccf3fcb..1e5eb908 100644
--- a/src/CalcViewModel/CalcViewModel.vcxproj
+++ b/src/CalcViewModel/CalcViewModel.vcxproj
@@ -42,54 +42,54 @@
14.0
true
Windows Store
- 10.0.18362.0
- 10.0.17134.0
+ 10.0.22000.0
+ 10.0.17763.0
10.0
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
@@ -417,4 +417,4 @@
-
\ No newline at end of file
+
diff --git a/src/CalcViewModelCopyForUT/CalcViewModelCopyForUT.vcxproj b/src/CalcViewModelCopyForUT/CalcViewModelCopyForUT.vcxproj
index ffee7eed..b77fd624 100644
--- a/src/CalcViewModelCopyForUT/CalcViewModelCopyForUT.vcxproj
+++ b/src/CalcViewModelCopyForUT/CalcViewModelCopyForUT.vcxproj
@@ -42,54 +42,54 @@
14.0
true
Windows Store
- 10.0.18362.0
- 10.0.17134.0
+ 10.0.22000.0
+ 10.0.17763.0
10.0
StaticLibrary
true
- v142
+ v143
StaticLibrary
true
- v142
+ v143
StaticLibrary
true
- v142
+ v143
StaticLibrary
true
- v142
+ v143
StaticLibrary
false
true
- v142
+ v143
StaticLibrary
false
true
- v142
+ v143
StaticLibrary
false
true
- v142
+ v143
StaticLibrary
false
true
- v142
+ v143
@@ -411,4 +411,4 @@
-
\ No newline at end of file
+
diff --git a/src/Calculator.sln b/src/Calculator.sln
index bda23c73..b93ada01 100644
--- a/src/Calculator.sln
+++ b/src/Calculator.sln
@@ -1,8 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29009.5
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio Version 17
+VisualStudioVersion = 17
+MinimumVisualStudioVersion = 17
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3A5DF651-B8A1-45CA-9135-964A6FC7F5D1}"
ProjectSection(SolutionItems) = preProject
..\.clang-format = ..\.clang-format
diff --git a/src/Calculator/Calculator.csproj b/src/Calculator/Calculator.csproj
index b4b71b77..461a93ed 100644
--- a/src/Calculator/Calculator.csproj
+++ b/src/Calculator/Calculator.csproj
@@ -13,8 +13,8 @@
true
en-US
UAP
- 10.0.19041.0
- 10.0.17134.0
+ 10.0.22000.0
+ 10.0.17763.0
false
false
diff --git a/src/CalculatorUITests/CalculatorUITests.csproj b/src/CalculatorUITests/CalculatorUITests.csproj
index 4728a892..a4dca976 100644
--- a/src/CalculatorUITests/CalculatorUITests.csproj
+++ b/src/CalculatorUITests/CalculatorUITests.csproj
@@ -1,6 +1,6 @@
- netcoreapp2.1
+ netcoreapp3.1
false
diff --git a/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj b/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj
index 28bca6f0..265d9469 100644
--- a/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj
+++ b/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj
@@ -7,8 +7,8 @@
15.0
true
Windows Store
- 10.0.18362.0
- 10.0.17134.0
+ 10.0.22000.0
+ 10.0.17763.0
10.0
15.0
NativeUnitTestProject
@@ -56,50 +56,50 @@
Application
true
- v142
+ v143
Application
true
- v142
+ v143
Application
true
- v142
+ v143
true
Application
true
- v142
+ v143
Application
false
true
- v142
+ v143
true
Application
false
true
- v142
+ v143
true
Application
false
true
- v142
+ v143
true
Application
false
true
- v142
+ v143
true
@@ -291,4 +291,4 @@
-
\ No newline at end of file
+
diff --git a/src/GraphControl/GraphControl.vcxproj b/src/GraphControl/GraphControl.vcxproj
index b267e87b..925735b6 100644
--- a/src/GraphControl/GraphControl.vcxproj
+++ b/src/GraphControl/GraphControl.vcxproj
@@ -42,54 +42,54 @@
14.0
true
Windows Store
- 10.0.18362.0
- 10.0.17134.0
+ 10.0.22000.0
+ 10.0.17763.0
10.0
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
@@ -355,4 +355,4 @@
-
\ No newline at end of file
+
diff --git a/src/GraphingImpl/GraphingImpl.vcxproj b/src/GraphingImpl/GraphingImpl.vcxproj
index f87e688f..0642084c 100644
--- a/src/GraphingImpl/GraphingImpl.vcxproj
+++ b/src/GraphingImpl/GraphingImpl.vcxproj
@@ -42,54 +42,54 @@
14.0
true
Windows Store
- 10.0.18362.0
- 10.0.17134.0
+ 10.0.22000.0
+ 10.0.17763.0
10.0
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
@@ -281,4 +281,4 @@
-
\ No newline at end of file
+
diff --git a/src/TraceLogging/TraceLogging.vcxproj b/src/TraceLogging/TraceLogging.vcxproj
index d93fbafa..a48e3ed7 100644
--- a/src/TraceLogging/TraceLogging.vcxproj
+++ b/src/TraceLogging/TraceLogging.vcxproj
@@ -42,54 +42,54 @@
14.0
true
Windows Store
- 10.0.18362.0
- 10.0.17134.0
+ 10.0.22000.0
+ 10.0.17763.0
10.0
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143
DynamicLibrary
false
true
- v142
+ v143