Skip to content

Commit 4cda0d7

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-4723145c-5e97-4753-945f-b8fc74fa9590
2 parents 0184c7f + 268619a commit 4cda0d7

File tree

29 files changed

+348
-378
lines changed

29 files changed

+348
-378
lines changed

‎.vsts-ci.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ resources:
5757
ref: refs/tags/release
5858

5959
extends:
60-
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
61-
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
62-
${{ else }}:
63-
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
60+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
6461
parameters:
6562
containers:
6663
alpine319WithNode:

‎NuGet.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-4/nuget/v3/index.json" />
1414
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-3/nuget/v3/index.json" />
1515
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-2/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-15/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-14/nuget/v3/index.json" />
1618
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-13" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-13/nuget/v3/index.json" />
1719
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-12/nuget/v3/index.json" />
1820
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-11/nuget/v3/index.json" />
@@ -63,6 +65,8 @@
6365
<add key="darc-pub-dotnet-templating-f46c70a-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-4/nuget/v3/index.json" />
6466
<add key="darc-pub-dotnet-templating-f46c70a-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-3/nuget/v3/index.json" />
6567
<add key="darc-pub-dotnet-templating-f46c70a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-2/nuget/v3/index.json" />
68+
<add key="darc-pub-dotnet-templating-f46c70a-15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-15/nuget/v3/index.json" />
69+
<add key="darc-pub-dotnet-templating-f46c70a-14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-14/nuget/v3/index.json" />
6670
<add key="darc-pub-dotnet-templating-f46c70a-13" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-13/nuget/v3/index.json" />
6771
<add key="darc-pub-dotnet-templating-f46c70a-12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-12/nuget/v3/index.json" />
6872
<add key="darc-pub-dotnet-templating-f46c70a-11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-11/nuget/v3/index.json" />

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -631,14 +631,14 @@
631631
<Uri>https://github.com/dotnet/arcade-services</Uri>
632632
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
633633
</Dependency>
634-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25061.2">
634+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25102.1">
635635
<Uri>https://github.com/dotnet/scenario-tests</Uri>
636-
<Sha>1512fd86b0eb245fe6d8efd7e833c37f5e290803</Sha>
636+
<Sha>008b3a357044b102ec30e15ac381c2e880f573af</Sha>
637637
</Dependency>
638638
<!-- Intermediate is necessary for source build. -->
639-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25061.2">
639+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25102.1">
640640
<Uri>https://github.com/dotnet/scenario-tests</Uri>
641-
<Sha>1512fd86b0eb245fe6d8efd7e833c37f5e290803</Sha>
641+
<Sha>008b3a357044b102ec30e15ac381c2e880f573af</Sha>
642642
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
643643
</Dependency>
644644
<!--

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>1</VersionSDKMinor>
9-
<VersionFeature>03</VersionFeature>
9+
<VersionFeature>04</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -261,7 +261,7 @@
261261
<PropertyGroup Label="Infrastructure and test only dependencies">
262262
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
263263
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
264-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25061.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
264+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25102.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
265265
</PropertyGroup>
266266
<PropertyGroup Label="Manually updated">
267267
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

‎eng/install-scancode.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euo pipefail
55
# Install instructions: https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-a-library-via-pip
66

77
# See latest release at https://github.com/nexB/scancode-toolkit/releases
8-
SCANCODE_VERSION="32.2.1"
8+
SCANCODE_VERSION="32.3.2"
99

1010
pyEnvPath="/tmp/scancode-env"
1111
python3 -m venv $pyEnvPath

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ jobs:
276276
fi
277277
278278
if [[ '${{ parameters.withPreviousSDK }}' == 'True' ]]; then
279-
# Source-built artifacts are from CentOS 9 Stream or Alpine 3.19. We want to download them without
279+
# Source-built artifacts are from CentOS 9 Stream. We want to download them without
280280
# downloading portable versions from the internet.
281281
customPrepArgs="${customPrepArgs} --no-sdk --no-bootstrap"
282282
prepSdk=false

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

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,13 @@ 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.alpinePreviousName) }}
128+
buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.centOSStreamName) }}
129129
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
130130
vmrBranch: ${{ variables.VmrBranch }}
131131
architecture: x64
132-
artifactsRid: ${{ variables.alpinePreviousX64Rid }}
132+
artifactsRid: ${{ variables.centOSStreamX64Rid }}
133133
pool: ${{ parameters.pool_Linux }}
134-
container: ${{ variables.alpinePreviousContainer }}
135-
targetRid: ${{ variables.alpinePreviousX64Rid }}
134+
container: ${{ variables.centOSStreamContainer }}
136135
buildFromArchive: false # 🚫
137136
buildSourceOnly: true # ✅
138137
enablePoison: true # ✅
@@ -166,18 +165,18 @@ stages:
166165
- template: ../jobs/vmr-build.yml
167166
parameters:
168167
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
169-
buildName: ${{ format('{0}_Online_MsftSdk', variables.alpineLatestName) }}
168+
buildName: ${{ format('{0}_Offline_MsftSdk', variables.alpineName) }}
170169
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
171170
vmrBranch: ${{ variables.VmrBranch }}
172171
architecture: x64
173172
pool: ${{ parameters.pool_Linux }}
174-
container: ${{ variables.alpineLatestContainer }}
175-
targetRid: ${{ variables.alpineLatestX64Rid }}
173+
container: ${{ variables.alpineContainer }}
174+
targetRid: ${{ variables.alpineX64Rid }}
176175
buildFromArchive: false # 🚫
177176
buildSourceOnly: true # ✅
178177
enablePoison: false # 🚫
179178
excludeOmniSharpTests: true # ✅
180-
runOnline: true # ✅
179+
runOnline: false # 🚫
181180
useMonoRuntime: false # 🚫
182181
withPreviousSDK: false # 🚫
183182

@@ -216,24 +215,6 @@ stages:
216215
useMonoRuntime: false # 🚫
217216
withPreviousSDK: true # ✅
218217

219-
- template: ../jobs/vmr-build.yml
220-
parameters:
221-
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
222-
buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.centOSStreamName) }}
223-
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
224-
vmrBranch: ${{ variables.VmrBranch }}
225-
architecture: x64
226-
artifactsRid: ${{ variables.centOSStreamX64Rid }}
227-
pool: ${{ parameters.pool_Linux }}
228-
container: ${{ variables.centOSStreamContainer }}
229-
buildFromArchive: false # 🚫
230-
buildSourceOnly: true # ✅
231-
enablePoison: false # 🚫
232-
excludeOmniSharpTests: true # ✅
233-
runOnline: false # 🚫
234-
useMonoRuntime: false # 🚫
235-
withPreviousSDK: true # ✅
236-
237218
- template: ../jobs/vmr-build.yml
238219
parameters:
239220
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline

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

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

1515
- name: almaLinuxContainer
1616
value: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build
17-
- name: alpineLatestContainer
17+
- name: alpineContainer
1818
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-amd64
19-
- name: alpinePreviousContainer
20-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode
2119
- name: centOSStreamContainer
2220
value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
2321
- name: fedoraContainer
@@ -49,10 +47,8 @@ variables:
4947

5048
- name: almaLinuxName
5149
value: AlmaLinux8
52-
- name: alpineLatestName
50+
- name: alpineName
5351
value: Alpine321
54-
- name: alpinePreviousName
55-
value: Alpine320
5652
- name: centOSStreamName
5753
value: CentOSStream9
5854
- name: fedoraName
@@ -68,10 +64,8 @@ variables:
6864
value: linux-musl-arm
6965
- name: linuxMuslArm64Rid
7066
value: linux-musl-arm64
71-
- name: alpineLatestX64Rid
67+
- name: alpineX64Rid
7268
value: alpine.3.21-x64
73-
- name: alpinePreviousX64Rid
74-
value: alpine.3.20-x64
7569
- name: centOSStreamX64Rid
7670
value: centos.9-x64
7771
- name: fedoraX64Rid

‎src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@
3434
<Target Name="ComputeContainerBaseImage"
3535
Returns="$(ContainerBaseImage)">
3636
<PropertyGroup>
37-
<ContainerRuntimeIdentifiers Condition="'$(BuildingInsideVisualStudio)' != 'true' and '$(ContainerRuntimeIdentifiers)' == '' and '$(IsRidAgnostic)' != 'true'">$(RuntimeIdentifiers)</ContainerRuntimeIdentifiers>
3837
<!-- The Container RID should default to the RID used for the entire build (to ensure things run on the platform they are built for), but the user knows best and so should be able to set it explicitly.
3938
For builds that have a RID, we default to that RID. Otherwise, we default to the Linux RID matching the architecture of the currently-executing SDK. -->
40-
<ContainerRuntimeIdentifier Condition="'$(ContainerRuntimeIdentifier)' == '' and '$(ContainerRuntimeIdentifiers)' == '' and '$(IsRidAgnostic)' != 'true'">$(RuntimeIdentifier)</ContainerRuntimeIdentifier>
39+
<ContainerRuntimeIdentifier Condition="'$(ContainerRuntimeIdentifier)' == '' and '$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier)</ContainerRuntimeIdentifier>
40+
<ContainerRuntimeIdentifiers Condition="'$(BuildingInsideVisualStudio)' != 'true' and '$(ContainerRuntimeIdentifiers)' == '' and '$(IsRidAgnostic)' != 'true'">$(RuntimeIdentifiers)</ContainerRuntimeIdentifiers>
4141
<ContainerRuntimeIdentifier Condition="'$(ContainerRuntimeIdentifier)' == '' and '$(ContainerRuntimeIdentifiers)' == ''">linux-$(NETCoreSdkPortableRuntimeIdentifier.Split('-')[1])</ContainerRuntimeIdentifier>
4242

4343
<_ContainerIsUsingMicrosoftDefaultImages Condition="'$(ContainerBaseImage)' == ''">true</_ContainerIsUsingMicrosoftDefaultImages>
4444
<_ContainerIsUsingMicrosoftDefaultImages Condition="'$(ContainerBaseImage)' != ''">false</_ContainerIsUsingMicrosoftDefaultImages>
4545
</PropertyGroup>
4646

4747
<ItemGroup>
48-
<_TargetRuntimeIdentifiers Include="$(ContainerRuntimeIdentifiers)" Condition="'$(ContainerRuntimeIdentifiers)' != ''" />
49-
<_TargetRuntimeIdentifiers Include="$(ContainerRuntimeIdentifier)" Condition="'$(ContainerRuntimeIdentifiers)' == ''" />
48+
<_TargetRuntimeIdentifiers Include="$(ContainerRuntimeIdentifier)" Condition="'$(ContainerRuntimeIdentifier)' != ''" />
49+
<_TargetRuntimeIdentifiers Include="$(ContainerRuntimeIdentifiers)" Condition="@(_TargetRuntimeIdentifiers->Count()) == 0" />
5050
</ItemGroup>
5151

5252
<ComputeDotnetBaseImageAndTag
@@ -298,9 +298,9 @@
298298

299299
<Target Name="_PublishMultiArchContainers" DependsOnTargets="$(PublishContainerDependsOn)" >
300300
<Error Text="ContainerArchiveOutputPath is invalid. It can only be a directory in multi-arch scenario because the runtime identifier is appended in the end of the filename."
301-
Condition="'$(ContainerArchiveOutputPath)' != '' and
302-
!$(ContainerArchiveOutputPath.EndsWith('/')) and
303-
!$(ContainerArchiveOutputPath.EndsWith('\\')) and
301+
Condition="'$(ContainerArchiveOutputPath)' != '' and
302+
!$(ContainerArchiveOutputPath.EndsWith('/')) and
303+
!$(ContainerArchiveOutputPath.EndsWith('\\')) and
304304
$(ContainerArchiveOutputPath.EndsWith('.tar.gz'))" />
305305

306306
<ItemGroup>
@@ -400,7 +400,14 @@
400400
Condition="'$(IsPublishable)' == 'true' AND '$(EnableSdkContainerSupport)' == 'true'">
401401
<PropertyGroup>
402402
<_IsMultiTFMBuild Condition="'$(TargetFrameworks)' != '' and '$(TargetFramework)' == ''">true</_IsMultiTFMBuild>
403-
<_IsMultiRIDBuild Condition="'$(BuildingInsideVisualStudio)' != 'true' and (('$(RuntimeIdentifiers)' != '' and '$(RuntimeIdentifier)' == '') or ('$(ContainerRuntimeIdentifiers)' != '' and '$(ContainerRuntimeIdentfier)' == ''))">true</_IsMultiRIDBuild>
403+
<!-- we are multi-RID if:
404+
* we have CRIDs and no CRID
405+
* we have RIDs and no (CRIDs or CRID or RID)
406+
-->
407+
<_HasCRIDsAndNoCRID Condition="'$(ContainerRuntimeIdentifiers)' != '' and '$(ContainerRuntimeIdentifier)' == ''">true</_HasCRIDsAndNoCRID>
408+
<_HasRIDs Condition="'$(RuntimeIdentifiers)' != ''">true</_HasRIDs>
409+
<_NoCRIDsOrCRIDorRID Condition="'$(ContainerRuntimeIdentifiers)' == '' and '$(ContainerRuntimeIdentifier)' == '' and '$(RuntimeIdentifier)' == ''">true</_NoCRIDsOrCRIDorRID>
410+
<_IsMultiRIDBuild Condition="'$(BuildingInsideVisualStudio)' != 'true' and ('$(_HasCRIDsAndNoCRID)' == true or ('$(_HasRIDs)' == 'true' and '$(_NoCRIDsOrCRIDorRID)' == 'true'))">true</_IsMultiRIDBuild>
404411
<_IsSingleRIDBuild Condition="'$(_IsMultiRIDBuild)' == ''">true</_IsSingleRIDBuild>
405412
</PropertyGroup>
406413

‎src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ jobs:
5757

5858
- template: templates/jobs/sdk-diff-tests.yml
5959
parameters:
60-
buildName: ${{ format('{0}_Online_MsftSdk', variables.alpineLatestName) }}
61-
targetRid: ${{ variables.alpineLatestX64Rid }}
60+
buildName: ${{ format('{0}_Offline_MsftSdk', variables.alpineName) }}
61+
targetRid: ${{ variables.alpineX64Rid }}
6262
architecture: x64
6363
dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}
6464

0 commit comments

Comments
 (0)