Skip to content

Commit 6f902f0

Browse files
EricJohnson327EricJohnson327
authored
Merge pull request #3236 from microsoft/staging
Release - 6/18/24
2 parents 5c257a7 + 51447fe commit 6f902f0

File tree

365 files changed

+37668
-1343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

365 files changed

+37668
-1343
lines changed

‎Build.ps1

+30-2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,23 @@ $env:sdk_version = build\Scripts\CreateBuildInfo.ps1 -Version $VersionOfSDK -IsS
4949

5050
$isAdmin = ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] 'Administrator')
5151

52+
function Write-XmlDocumentToFile {
53+
param (
54+
[System.Xml.XmlDocument]$xmlDocument,
55+
[string]$filePath
56+
)
57+
58+
$settings = New-Object System.Xml.XmlWriterSettings
59+
$settings.Indent = $true
60+
$settings.CheckCharacters = $false
61+
$settings.NewLineChars = "`r`n"
62+
63+
$writer = [System.Xml.XmlWriter]::Create($filePath, $settings)
64+
$xmlDocument.WriteTo($writer)
65+
$writer.Flush()
66+
$writer.Close()
67+
}
68+
5269
if ($IsAzurePipelineBuild) {
5370
Copy-Item (Join-Path $env:Build_RootDirectory "build\nuget.config.internal") -Destination (Join-Path $env:Build_RootDirectory "nuget.config")
5471
}
@@ -127,6 +144,11 @@ Try {
127144
$uapExtension = [System.Xml.Linq.XName]::Get("{http://schemas.microsoft.com/appx/manifest/uap/windows10/3}Extension");
128145
$uapAppExtension = [System.Xml.Linq.XName]::Get("{http://schemas.microsoft.com/appx/manifest/uap/windows10/3}AppExtension");
129146

147+
# Update C++ version resources and header
148+
$cppHeader = (Join-Path $env:Build_RootDirectory "build\cppversion\version.h")
149+
$updatebinverpath = (Join-Path $env:Build_RootDirectory "build\scripts\update-binver.ps1")
150+
& $updatebinverpath -TargetFile $cppHeader -BuildVersion $env:msix_version
151+
130152
# Update the appxmanifest
131153
$appxmanifestPath = (Join-Path $env:Build_RootDirectory "src\Package.appxmanifest")
132154
$appxmanifest = [System.Xml.Linq.XDocument]::Load($appxmanifestPath)
@@ -151,7 +173,7 @@ Try {
151173
}
152174
}
153175
}
154-
$appxmanifest.Save($appxmanifestPath)
176+
Write-XmlDocumentToFile -xmlDocument $appxmanifest -filePath $appxmanifestPath
155177

156178
# This is needed for vcxproj
157179
& $nugetPath restore
@@ -164,6 +186,7 @@ Try {
164186
("DevHome.sln"),
165187
("/p:Platform="+$platform),
166188
("/p:Configuration="+$configuration),
189+
("/p:Version="+$env:msix_version),
167190
("/restore"),
168191
("/binaryLogger:DevHome.$platform.$configuration.binlog"),
169192
("/p:AppxPackageOutput=$appxPackageDir\DevHome-$platform.msix"),
@@ -186,6 +209,11 @@ Try {
186209
}
187210
}
188211

212+
# reset version file back to original values
213+
$cppHeader = (Join-Path $env:Build_RootDirectory "build\cppversion\version.h")
214+
$updatebinverpath = (Join-Path $env:Build_RootDirectory "build\scripts\update-binver.ps1")
215+
& $updatebinverpath -TargetFile $cppHeader -BuildVersion "1.0.0.0"
216+
189217
# Reset the appxmanifest to prevent unnecessary code changes
190218
$appxmanifest = [System.Xml.Linq.XDocument]::Load($appxmanifestPath)
191219
$appxmanifest.Root.Element($xIdentity).Attribute("Version").Value = "0.0.0.0"
@@ -203,7 +231,7 @@ Try {
203231
}
204232
}
205233
}
206-
$appxmanifest.Save($appxmanifestPath)
234+
Write-XmlDocumentToFile -xmlDocument $appxmanifest -filePath $appxmanifestPath
207235
}
208236

209237
if (($BuildStep -ieq "stubpackages")) {

‎DevHome.sln

+28
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevSetupAgent.Test", "exten
122122
EndProject
123123
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HyperVExtension.HostGuestCommunication", "extensions\HyperVExtension\src\HyperVExtension.HostGuestCommunication\HyperVExtension.HostGuestCommunication.csproj", "{D759CD66-494C-4A00-8075-8B65A9891349}"
124124
EndProject
125+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome.PI", "tools\PI\DevHome.PI\DevHome.PI.csproj", "{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725}"
126+
EndProject
127+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PI", "PI", "{DB3D0F2C-1A7F-44B4-B408-B21A56212985}"
128+
EndProject
125129
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Customization", "Customization", "{623998FD-B0A6-4980-95D5-A5072301CA10}"
126130
EndProject
127131
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome.Customization", "tools\Customization\DevHome.Customization\DevHome.Customization.csproj", "{AF527EA4-6A24-4BD6-BC6E-A5863DC3489C}"
@@ -142,6 +146,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome.EnvironmentVariable
142146
EndProject
143147
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DevHome.Telemetry.Native", "telemetry\DevHome.Telemetry.Native\DevHome.Telemetry.Native.vcxproj", "{8EB52F7D-D216-49FF-BF16-DE06E4695950}"
144148
EndProject
149+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{E768781A-D1F7-4C03-B46D-E76354FAB587}"
150+
ProjectSection(SolutionItems) = preProject
151+
tools\scripts\CaptureDevHomeLogs.ps1 = tools\scripts\CaptureDevHomeLogs.ps1
152+
EndProjectSection
153+
EndProject
145154
Global
146155
GlobalSection(SolutionConfigurationPlatforms) = preSolution
147156
Debug|arm64 = Debug|arm64
@@ -614,6 +623,18 @@ Global
614623
{D759CD66-494C-4A00-8075-8B65A9891349}.Release|x64.Build.0 = Release|x64
615624
{D759CD66-494C-4A00-8075-8B65A9891349}.Release|x86.ActiveCfg = Release|x86
616625
{D759CD66-494C-4A00-8075-8B65A9891349}.Release|x86.Build.0 = Release|x86
626+
{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725}.Debug|arm64.ActiveCfg = Debug|ARM64
627+
{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725}.Debug|arm64.Build.0 = Debug|ARM64
628+
{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725}.Debug|x64.ActiveCfg = Debug|x64
629+
{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725}.Debug|x64.Build.0 = Debug|x64
630+
{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725}.Debug|x86.ActiveCfg = Debug|x86
631+
{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725}.Debug|x86.Build.0 = Debug|x86
632+
{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725}.Release|arm64.ActiveCfg = Release|ARM64
633+
{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725}.Release|arm64.Build.0 = Release|ARM64
634+
{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725}.Release|x64.ActiveCfg = Release|x64
635+
{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725}.Release|x64.Build.0 = Release|x64
636+
{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725}.Release|x86.ActiveCfg = Release|x86
637+
{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725}.Release|x86.Build.0 = Release|x86
617638
{AF527EA4-6A24-4BD6-BC6E-A5863DC3489C}.Debug|arm64.ActiveCfg = Debug|arm64
618639
{AF527EA4-6A24-4BD6-BC6E-A5863DC3489C}.Debug|arm64.Build.0 = Debug|arm64
619640
{AF527EA4-6A24-4BD6-BC6E-A5863DC3489C}.Debug|x64.ActiveCfg = Debug|x64
@@ -745,15 +766,22 @@ Global
745766
{F4095FD3-6A3F-490B-966D-E63059612EE6} = {3E3791DF-070D-4ADE-96E8-93D6FBD53953}
746767
{0E05A442-BDC7-43D4-A000-F8C986826716} = {3E3791DF-070D-4ADE-96E8-93D6FBD53953}
747768
{D759CD66-494C-4A00-8075-8B65A9891349} = {81AACED5-CFB5-47A6-AFD6-4625AADCFFA3}
769+
{CAAC0CDF-9AB8-4F43-A3EB-38D785AF5725} = {DB3D0F2C-1A7F-44B4-B408-B21A56212985}
770+
{DB3D0F2C-1A7F-44B4-B408-B21A56212985} = {A972EC5B-FC61-4964-A6FF-F9633EB75DFD}
748771
{623998FD-B0A6-4980-95D5-A5072301CA10} = {A972EC5B-FC61-4964-A6FF-F9633EB75DFD}
749772
{AF527EA4-6A24-4BD6-BC6E-A5863DC3489C} = {623998FD-B0A6-4980-95D5-A5072301CA10}
750773
{FAB6FAA7-ADF4-4B65-9831-0C819915E6E1} = {A972EC5B-FC61-4964-A6FF-F9633EB75DFD}
751774
{19C08C57-7C22-48C9-9B6C-FAAF1FCC65E7} = {FAB6FAA7-ADF4-4B65-9831-0C819915E6E1}
752775
{1317314E-9BDD-4F1C-A76F-22121637A091} = {FAB6FAA7-ADF4-4B65-9831-0C819915E6E1}
753776
{2E5629CA-0D1B-42B1-8D6E-934A6E1E18D9} = {FAB6FAA7-ADF4-4B65-9831-0C819915E6E1}
754777
{5F9749BC-F34E-4F45-933F-61E0F3ED521F} = {FAB6FAA7-ADF4-4B65-9831-0C819915E6E1}
778+
{E768781A-D1F7-4C03-B46D-E76354FAB587} = {A972EC5B-FC61-4964-A6FF-F9633EB75DFD}
755779
EndGlobalSection
756780
GlobalSection(ExtensibilityGlobals) = postSolution
757781
SolutionGuid = {030B5641-B206-46BB-BF71-36FF009088FA}
758782
EndGlobalSection
783+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
784+
build\cppversion\version.vcxitems*{092ac740-da01-4872-8e93-b9557dad6be5}*SharedItemsImports = 5
785+
build\cppversion\version.vcxitems*{60e0fd98-5396-436d-bab7-187a853a5dc6}*SharedItemsImports = 5
786+
EndGlobalSection
759787
EndGlobal

‎Directory.CppBuild.props

+4
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,8 @@
55
<CppBaseOutDir>$(SolutionDir)tools\bin\$(CppPlatformTarget)\$(Configuration)\</CppBaseOutDir>
66
<CppOutDir>$(CppBaseOutDir)$(MSBuildProjectName)\</CppOutDir>
77
</PropertyGroup>
8+
9+
<ImportGroup Label="Shared">
10+
<Import Project="$(SolutionDir)build\cppversion\version.vcxitems" Label="Shared" />
11+
</ImportGroup>
812
</Project>

‎TestingScenarios.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ These are the testing scenarios that need to be validated before shipping a new
1212
1. [Managing Environments](tools/Environments/DevHome.Environments/TestingScenarios/ManageEnvironments.md)
1313
1. [Creating Environment](tools/SetupFlow/DevHome.SetupFlow.UnitTest/TestingScenarios/CreateEnvironment.md)
1414
1. [Setting up an Environment](tools/SetupFlow/DevHome.SetupFlow.UnitTest/TestingScenarios/SetupEnvironment.md)
15-
15+
1. [Quickstart Playground](tools/SetupFlow/DevHome.SetupFlow.UnitTest/TestingScenarios/QuickstartPlayground.md)

‎build/TriggerReleaseBuild.yml

+35-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
11
trigger:
22
- release
33

4-
steps:
5-
- script: echo Triggering ADO Build
6-
displayName: 'Triggering ADO Build'
4+
resources:
5+
repositories:
6+
- repository: templates_onebranch
7+
type: git
8+
name: OneBranch.Pipelines/GovernedTemplates
9+
ref: refs/heads/main
10+
- repository: m365Pipelines
11+
type: git
12+
name: 1ESPipelineTemplates/M365GPT
13+
ref: refs/tags/release
14+
15+
extends:
16+
template: v1/M365.Official.PipelineTemplate.yml@m365Pipelines
17+
parameters:
18+
sdl:
19+
roslyn:
20+
enabled: true
21+
arrow:
22+
serviceConnection: DevHome Build VM Generation
23+
baseline:
24+
baselineFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnbaselines
25+
pool:
26+
name: Azure-Pipelines-1ESPT-ExDShared
27+
image: windows-2022
28+
os: windows
29+
customBuildTags:
30+
- ES365AIMigrationTooling
31+
stages:
32+
- stage: Trigger_Build
33+
dependsOn: []
34+
jobs:
35+
- job: Trigger_Build
36+
steps:
37+
- script: echo Triggering ADO Build
38+
displayName: 'Triggering ADO Build'

‎build/TriggerStagingBuild.yml

+35-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
11
trigger:
22
- staging
33

4-
steps:
5-
- script: echo Triggering ADO Build
6-
displayName: 'Triggering ADO Build'
4+
resources:
5+
repositories:
6+
- repository: templates_onebranch
7+
type: git
8+
name: OneBranch.Pipelines/GovernedTemplates
9+
ref: refs/heads/main
10+
- repository: m365Pipelines
11+
type: git
12+
name: 1ESPipelineTemplates/M365GPT
13+
ref: refs/tags/release
14+
15+
extends:
16+
template: v1/M365.Official.PipelineTemplate.yml@m365Pipelines
17+
parameters:
18+
sdl:
19+
roslyn:
20+
enabled: true
21+
arrow:
22+
serviceConnection: DevHome Build VM Generation
23+
baseline:
24+
baselineFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnbaselines
25+
pool:
26+
name: Azure-Pipelines-1ESPT-ExDShared
27+
image: windows-2022
28+
os: windows
29+
customBuildTags:
30+
- ES365AIMigrationTooling
31+
stages:
32+
- stage: Trigger_Build
33+
dependsOn: []
34+
jobs:
35+
- job: Trigger_Build
36+
steps:
37+
- script: echo Triggering ADO Build
38+
displayName: 'Triggering ADO Build'

0 commit comments

Comments
 (0)