Skip to content

Commit 4fb5420

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/8.0' changes
2 parents 90f8928 + d65b2f0 commit 4fb5420

15 files changed

+33
-32
lines changed

‎eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -376,26 +376,26 @@
376376
<Uri>https://github.com/dotnet/winforms</Uri>
377377
<Sha>abda8e3bfa78319363526b5a5f86863ec979940e</Sha>
378378
</Dependency>
379-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24165.4">
379+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24204.3">
380380
<Uri>https://github.com/dotnet/arcade</Uri>
381-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
381+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
382382
<SourceBuild RepoName="arcade" ManagedOnly="true" />
383383
</Dependency>
384-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24165.4">
384+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24204.3">
385385
<Uri>https://github.com/dotnet/arcade</Uri>
386-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
386+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
387387
</Dependency>
388-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24165.4">
388+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24204.3">
389389
<Uri>https://github.com/dotnet/arcade</Uri>
390-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
390+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
391391
</Dependency>
392-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24165.4">
392+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24204.3">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
394+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24165.4">
396+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24204.3">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
398+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
399399
</Dependency>
400400
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="8.1.0-preview.23604.1">
401401
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@
161161
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
162162
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
163163
<!-- Packages from dotnet/arcade -->
164-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24165.4</MicrosoftDotNetBuildTasksInstallersVersion>
165-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24165.4</MicrosoftDotNetBuildTasksTemplatingVersion>
166-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24165.4</MicrosoftDotNetRemoteExecutorVersion>
164+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksInstallersVersion>
165+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksTemplatingVersion>
166+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24204.3</MicrosoftDotNetRemoteExecutorVersion>
167167
<!-- Packages from dotnet/source-build-externals -->
168168
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.24175.3</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
169169
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/native/init-compiler.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then
6363
# Set default versions
6464
if [ -z "$majorVersion" ]; then
6565
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
66-
if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
66+
if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
6767
elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
6868

6969
for version in $versions; do

‎eng/common/templates-official/job/job.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,15 @@ jobs:
128128

129129
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
130130
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
131-
- task: MicroBuildSigningPlugin@3
131+
- task: MicroBuildSigningPlugin@4
132132
displayName: Install MicroBuild plugin
133133
inputs:
134134
signType: $(_SignType)
135135
zipSources: false
136136
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137137
env:
138138
TeamName: $(_TeamName)
139+
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
139140
continueOnError: ${{ parameters.continueOnError }}
140141
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
141142

‎eng/common/templates-official/job/onelocbuild.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# If it's not devdiv, it's dnceng
5757
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
5858
name: $(DncEngInternalBuildPool)
59-
image: 1es-windows-2022-pt
59+
image: 1es-windows-2022
6060
os: windows
6161

6262
steps:

‎eng/common/templates-official/job/publish-build-assets.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ jobs:
6060
os: windows
6161
# If it's not devdiv, it's dnceng
6262
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
63-
name: $(DncEngInternalBuildPool)
64-
image: 1es-windows-2022-pt
63+
name: NetCore1ESPool-Publishing-Internal
64+
image: windows.vs2019.amd64
6565
os: windows
6666
steps:
6767
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

‎eng/common/templates-official/job/source-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
${{ if eq(variables['System.TeamProject'], 'internal') }}:
5454
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
55-
image: 1es-mariner-2-pt
55+
image: 1es-mariner-2
5656
os: linux
5757

5858
${{ if ne(parameters.platform.pool, '') }}:

‎eng/common/templates-official/job/source-index-stage1.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
demands: ImageOverride -equals windows.vs2019.amd64.open
3434
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3535
name: $(DncEngInternalBuildPool)
36-
image: 1es-windows-2022-pt
36+
image: windows.vs2022.amd64
3737
os: windows
3838

3939
steps:

‎eng/common/templates-official/post-build/post-build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ stages:
110110
# If it's not devdiv, it's dnceng
111111
${{ else }}:
112112
name: $(DncEngInternalBuildPool)
113-
image: 1es-windows-2022-pt
113+
image: 1es-windows-2022
114114
os: windows
115115

116116
steps:
@@ -150,7 +150,7 @@ stages:
150150
# If it's not devdiv, it's dnceng
151151
${{ else }}:
152152
name: $(DncEngInternalBuildPool)
153-
image: 1es-windows-2022-pt
153+
image: 1es-windows-2022
154154
os: windows
155155
steps:
156156
- template: setup-maestro-vars.yml
@@ -208,7 +208,7 @@ stages:
208208
# If it's not devdiv, it's dnceng
209209
${{ else }}:
210210
name: $(DncEngInternalBuildPool)
211-
image: 1es-windows-2022-pt
211+
image: 1es-windows-2022
212212
os: windows
213213
steps:
214214
- template: setup-maestro-vars.yml
@@ -261,8 +261,8 @@ stages:
261261
os: windows
262262
# If it's not devdiv, it's dnceng
263263
${{ else }}:
264-
name: $(DncEngInternalBuildPool)
265-
image: 1es-windows-2022-pt
264+
name: NetCore1ESPool-Publishing-Internal
265+
image: windows.vs2019.amd64
266266
os: windows
267267
steps:
268268
- template: setup-maestro-vars.yml

‎eng/common/templates-official/steps/component-governance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44

55
steps:
66
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
7-
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
7+
- script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
88
displayName: Set skipComponentGovernanceDetection variable
99
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
1010
- task: ComponentGovernanceComponentDetection@0

‎eng/common/templates-official/variables/pool-providers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# image: 1es-windows-2022-pt
26+
# image: 1es-windows-2022
2727

2828
variables:
2929
# Coalesce the target and source branches so we know when a PR targets a release branch

‎eng/common/templates/steps/component-governance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44

55
steps:
66
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
7-
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
7+
- script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
88
displayName: Set skipComponentGovernanceDetection variable
99
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
1010
- task: ComponentGovernanceComponentDetection@0

‎eng/targets/Wix.Common.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<SchemaVersion>2.0</SchemaVersion>
66
<ProductVersion>3.14</ProductVersion>
7-
<WixVersion>3.14.0-8606.20240208.1</WixVersion>
7+
<WixVersion>$(MicrosoftSignedWixVersion)</WixVersion>
88
</PropertyGroup>
99

1010
<PropertyGroup>

‎eng/tools/RepoTasks/RepoTasks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</ItemGroup>
3535

3636
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
37-
<PackageReference Include="Microsoft.Signed.Wix" Version="3.14.0-8606.20240208.1" />
37+
<PackageReference Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" />
3838
<PackageReference Include="System.Net.Http" Version="4.3.4" />
3939

4040
<Reference Include="Microsoft.Build" />

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.19",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24165.4",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24165.4"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24204.3",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24204.3"
3232
}
3333
}

0 commit comments

Comments
 (0)