Skip to content

Commit 81b7acc

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/8.0' changes
2 parents d456d41 + 66c7a0f commit 81b7acc

File tree

14 files changed

+38
-35
lines changed

14 files changed

+38
-35
lines changed

‎NuGet.config‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-runtime -->
12-
<add key="darc-int-dotnet-runtime-2d7eea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2d7eea25/nuget/v3/index.json" />
1312
<!-- End: Package sources from dotnet-runtime -->
1413
<!-- Begin: Package sources from dotnet-winforms -->
1514
<add key="darc-int-dotnet-winforms-41a4bd6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-41a4bd69/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-winforms-41a4bd6-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-41a4bd69-2/nuget/v3/index.json" />
16+
<add key="darc-int-dotnet-winforms-41a4bd6-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-41a4bd69-1/nuget/v3/index.json" />
1617
<!-- End: Package sources from dotnet-winforms -->
1718
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1819
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -25,9 +26,10 @@
2526
<clear />
2627
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2728
<!-- Begin: Package sources from dotnet-runtime -->
28-
<add key="darc-int-dotnet-runtime-2d7eea2" value="true" />
2929
<!-- End: Package sources from dotnet-runtime -->
3030
<!-- Begin: Package sources from dotnet-winforms -->
31+
<add key="darc-int-dotnet-winforms-41a4bd6-1" value="true" />
32+
<add key="darc-int-dotnet-winforms-41a4bd6-2" value="true" />
3133
<add key="darc-int-dotnet-winforms-41a4bd6" value="true" />
3234
<!-- End: Package sources from dotnet-winforms -->
3335
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,29 +151,29 @@
151151
</Dependency>
152152
</ProductDependencies>
153153
<ToolsetDependencies>
154-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24165.4">
154+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24204.3">
155155
<Uri>https://github.com/dotnet/arcade</Uri>
156-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
156+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
157157
</Dependency>
158-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24165.4">
158+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24204.3">
159159
<Uri>https://github.com/dotnet/arcade</Uri>
160-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
160+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
161161
</Dependency>
162-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24165.4">
162+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24204.3">
163163
<Uri>https://github.com/dotnet/arcade</Uri>
164-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
164+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24165.4">
166+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24204.3">
167167
<Uri>https://github.com/dotnet/arcade</Uri>
168-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
168+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
169169
</Dependency>
170-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24165.4">
170+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24204.3">
171171
<Uri>https://github.com/dotnet/arcade</Uri>
172-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
172+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24165.4">
174+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24204.3">
175175
<Uri>https://github.com/dotnet/arcade</Uri>
176-
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
176+
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
177177
</Dependency>
178178
</ToolsetDependencies>
179179
</Dependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
</PropertyGroup>
1313
<PropertyGroup>
1414
<!-- arcade -->
15-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24165.4</MicrosoftDotNetBuildTasksFeedVersion>
16-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24165.4</MicrosoftDotNetBuildTasksArchivesVersion>
17-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24165.4</MicrosoftDotNetBuildTasksInstallersVersion>
18-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24165.4</MicrosoftDotNetVersionToolsTasksVersion>
15+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksFeedVersion>
16+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksArchivesVersion>
17+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksInstallersVersion>
18+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24204.3</MicrosoftDotNetVersionToolsTasksVersion>
1919
<!-- corefx -->
2020
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
2121
<SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>

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

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 5 additions & 5 deletions
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

0 commit comments

Comments
 (0)