Skip to content

Commit 009495a

Browse files
MiYanniMiYanni
authored
Merge branch 'main' into FixCodeOwnersFile
2 parents cf98059 + 365af5f commit 009495a

File tree

99 files changed

+1793
-1229
lines changed

Some content is hidden

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

99 files changed

+1793
-1229
lines changed

‎eng/ManualVersions.props

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
Basically: In this file, choose the highest version when resolving merge conflicts.
1010
-->
1111
<PropertyGroup>
12-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.31</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.31</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.31</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.31</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.31</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.31</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
12+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.34</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.34</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.34</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.34</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.34</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.34</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.34</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
1819
</PropertyGroup>
1920

2021
</Project>

‎eng/Version.Details.xml

Lines changed: 196 additions & 196 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 81 additions & 81 deletions
Large diffs are not rendered by default.

‎eng/pipelines/templates/stages/vmr-build.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,14 @@ stages:
125125
- template: ../jobs/vmr-build.yml
126126
parameters:
127127
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
128-
buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.alpineName) }}
128+
buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.alpinePreviousName) }}
129129
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
130130
vmrBranch: ${{ variables.VmrBranch }}
131131
architecture: x64
132-
artifactsRid: ${{ variables.alpineX64Rid }}
132+
artifactsRid: ${{ variables.alpinePreviousX64Rid }}
133133
pool: ${{ parameters.pool_Linux }}
134-
container: ${{ variables.alpineContainer }}
135-
extraProperties: /p:TargetRID=${{ variables.alpineX64Rid }}
134+
container: ${{ variables.alpinePreviousContainer }}
135+
extraProperties: /p:TargetRID=${{ variables.alpinePreviousX64Rid }}
136136
buildFromArchive: false # 🚫
137137
buildSourceOnly: true # ✅
138138
enablePoison: true # ✅
@@ -154,6 +154,7 @@ stages:
154154
architecture: x64
155155
pool: ${{ parameters.pool_Linux }}
156156
container: ${{ variables.almaLinuxContainer }}
157+
extraProperties: /p:TargetRID=${{ variables.almaLinuxX64Rid }}
157158
buildFromArchive: false # 🚫
158159
buildSourceOnly: true # ✅
159160
enablePoison: false # 🚫
@@ -165,13 +166,13 @@ stages:
165166
- template: ../jobs/vmr-build.yml
166167
parameters:
167168
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
168-
buildName: ${{ format('{0}_Online_MsftSdk', variables.alpineName) }}
169+
buildName: ${{ format('{0}_Online_MsftSdk', variables.alpineLatestName) }}
169170
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
170171
vmrBranch: ${{ variables.VmrBranch }}
171172
architecture: x64
172173
pool: ${{ parameters.pool_Linux }}
173-
container: ${{ variables.alpineContainer }}
174-
extraProperties: /p:TargetRID=${{ variables.alpineX64Rid }}
174+
container: ${{ variables.alpineLatestContainer }}
175+
extraProperties: /p:TargetRID=${{ variables.alpineLatestX64Rid }}
175176
buildFromArchive: false # 🚫
176177
buildSourceOnly: true # ✅
177178
enablePoison: false # 🚫

‎eng/pipelines/templates/variables/vmr-build.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ variables:
1414

1515
- name: almaLinuxContainer
1616
value: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build
17-
- name: alpineContainer
17+
- name: alpineLatestContainer
18+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode
19+
- name: alpinePreviousContainer
1820
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
1921
- name: centOSStreamContainer
2022
value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
@@ -47,7 +49,9 @@ variables:
4749

4850
- name: almaLinuxName
4951
value: AlmaLinux8
50-
- name: alpineName
52+
- name: alpineLatestName
53+
value: Alpine320
54+
- name: alpinePreviousName
5155
value: Alpine319
5256
- name: centOSStreamName
5357
value: CentOSStream9
@@ -58,7 +62,9 @@ variables:
5862

5963
- name: almaLinuxX64Rid
6064
value: almalinux.8-x64
61-
- name: alpineX64Rid
65+
- name: alpineLatestX64Rid
66+
value: alpine.3.20-x64
67+
- name: alpinePreviousX64Rid
6268
value: alpine.3.19-x64
6369
- name: centOSStreamX64Rid
6470
value: centos.9-x64

‎src/Cli/Microsoft.DotNet.Cli.Utils/PathUtility.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static bool TryDeleteDirectory(string directoryPath)
102102
/// and continues to its parent until it fails. Returns whether it succeeded
103103
/// in deleting the file it was intended to delete.
104104
/// </summary>
105-
public static bool DeleteFileAndEmptyParents(string path)
105+
public static bool DeleteFileAndEmptyParents(string path, int maxDirectoriesToDelete = int.MaxValue)
106106
{
107107
if (!File.Exists(path))
108108
{
@@ -112,9 +112,13 @@ public static bool DeleteFileAndEmptyParents(string path)
112112
File.Delete(path);
113113
var dir = Path.GetDirectoryName(path);
114114

115-
while (!Directory.EnumerateFileSystemEntries(dir).Any())
115+
int directoriesDeleted = 0;
116+
117+
while (!Directory.EnumerateFileSystemEntries(dir).Any() &&
118+
directoriesDeleted < maxDirectoriesToDelete)
116119
{
117120
Directory.Delete(dir);
121+
directoriesDeleted++;
118122
dir = Path.GetDirectoryName(dir);
119123
}
120124

‎src/Cli/dotnet/Installer/Windows/InstallMessageDispatcher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public InstallResponseMessage SendSaveInstallStateManifestVersions(SdkFeatureBan
183183
/// <param name="sdkFeatureBand">The SDK feature band of the install state file to write</param>
184184
/// <param name="newMode">Whether to use workload sets or not</param>
185185
/// <returns></returns>
186-
public InstallResponseMessage SendUpdateWorkloadModeRequest(SdkFeatureBand sdkFeatureBand, bool newMode)
186+
public InstallResponseMessage SendUpdateWorkloadModeRequest(SdkFeatureBand sdkFeatureBand, bool? newMode)
187187
{
188188
return Send(new InstallRequestMessage
189189
{

‎src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public string WorkloadId
123123
/// <summary>
124124
/// The new mode to use: workloadset or loosemanifests
125125
/// </summary>
126-
public bool UseWorkloadSets
126+
public bool? UseWorkloadSets
127127
{
128128
get; set;
129129
}

0 commit comments

Comments
 (0)