Skip to content

Commit fe08496

Browse files
carlossanlopcarlossanlop
authored
Merge pull request #102397 from dotnet-maestro-bot/merge/release/8.0-to-release/8.0-staging
[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
2 parents 106b02f + 73dd598 commit fe08496

File tree

12 files changed

+289
-141
lines changed

12 files changed

+289
-141
lines changed

‎eng/Version.Details.xml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -111,79 +111,79 @@
111111
</Dependency>
112112
</ProductDependencies>
113113
<ToolsetDependencies>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24204.3">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24266.3">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
116+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119119
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
120120
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
121121
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
122122
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
123123
</Dependency>
124-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24204.3">
124+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24266.3">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
126+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24204.3">
128+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24266.3">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
130+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24204.3">
132+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24266.3">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
134+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24204.3">
136+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24266.3">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
138+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24204.3">
140+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24266.3">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
142+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24204.3">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24266.3">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
146+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.24204.3">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.24266.3">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
150+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24204.3">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24266.3">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
154+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
155155
</Dependency>
156-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24204.3">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24266.3">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
158+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24204.3">
160+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24266.3">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
162+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24204.3">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24266.3">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
166+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.24204.3">
168+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.24266.3">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
170+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24204.3">
172+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24266.3">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
174+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24204.3">
176+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24266.3">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
178+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24204.3">
180+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24266.3">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
182+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24204.3">
184+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24266.3">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
186+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
187187
</Dependency>
188188
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24270.1">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -334,9 +334,9 @@
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335335
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
336336
</Dependency>
337-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24204.3">
337+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24266.3">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
339-
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
339+
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
340340
</Dependency>
341341
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23566.3">
342342
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project>
22
<PropertyGroup>
33
<!-- The .NET product branding version -->
4-
<ProductVersion>8.0.6</ProductVersion>
4+
<ProductVersion>8.0.7</ProductVersion>
55
<!-- File version numbers -->
66
<MajorVersion>8</MajorVersion>
77
<MinorVersion>0</MinorVersion>
8-
<PatchVersion>6</PatchVersion>
8+
<PatchVersion>7</PatchVersion>
99
<SdkBandVersion>8.0.100</SdkBandVersion>
10-
<PackageVersionNet7>7.0.19</PackageVersionNet7>
10+
<PackageVersionNet7>7.0.20</PackageVersionNet7>
1111
<PackageVersionNet6>6.0.$([MSBuild]::Add($(PatchVersion),25))</PackageVersionNet6>
1212
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
1313
<PreReleaseVersionIteration>
@@ -87,21 +87,21 @@
8787
<!-- SDK dependencies -->
8888
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
8989
<!-- Arcade dependencies -->
90-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksFeedVersion>
91-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24204.3</MicrosoftDotNetCodeAnalysisVersion>
92-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.24204.3</MicrosoftDotNetGenAPIVersion>
93-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.24204.3</MicrosoftDotNetGenFacadesVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24204.3</MicrosoftDotNetXUnitExtensionsVersion>
95-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24204.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
96-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksArchivesVersion>
97-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksInstallersVersion>
98-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksPackagingVersion>
99-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksTemplatingVersion>
101-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24204.3</MicrosoftDotNetRemoteExecutorVersion>
103-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24204.3</MicrosoftDotNetVersionToolsTasksVersion>
104-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.24204.3</MicrosoftDotNetPackageTestingVersion>
90+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksFeedVersion>
91+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24266.3</MicrosoftDotNetCodeAnalysisVersion>
92+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.24266.3</MicrosoftDotNetGenAPIVersion>
93+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.24266.3</MicrosoftDotNetGenFacadesVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24266.3</MicrosoftDotNetXUnitExtensionsVersion>
95+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24266.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
96+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksArchivesVersion>
97+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksInstallersVersion>
98+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksPackagingVersion>
99+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksTemplatingVersion>
101+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24266.3</MicrosoftDotNetRemoteExecutorVersion>
103+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24266.3</MicrosoftDotNetVersionToolsTasksVersion>
104+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.24266.3</MicrosoftDotNetPackageTestingVersion>
105105
<!-- NuGet dependencies -->
106106
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
107107
<!-- Installer dependencies -->

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

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20230228.2
3+
sourceIndexUploadPackageVersion: 2.0.0-20240502.12
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
45
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
56
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
67
preSteps: []
@@ -14,15 +15,15 @@ jobs:
1415
dependsOn: ${{ parameters.dependsOn }}
1516
condition: ${{ parameters.condition }}
1617
variables:
17-
- name: SourceIndexPackageVersion
18-
value: ${{ parameters.sourceIndexPackageVersion }}
18+
- name: SourceIndexUploadPackageVersion
19+
value: ${{ parameters.sourceIndexUploadPackageVersion }}
20+
- name: SourceIndexProcessBinlogPackageVersion
21+
value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
1922
- name: SourceIndexPackageSource
2023
value: ${{ parameters.sourceIndexPackageSource }}
2124
- name: BinlogPath
2225
value: ${{ parameters.binlogPath }}
23-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
24-
- group: source-dot-net stage1 variables
25-
- template: /eng/common/templates-official/variables/pool-providers.yml
26+
- template: /eng/common/templates/variables/pool-providers.yml
2627

2728
${{ if ne(parameters.pool, '') }}:
2829
pool: ${{ parameters.pool }}
@@ -33,24 +34,23 @@ jobs:
3334
demands: ImageOverride -equals windows.vs2019.amd64.open
3435
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3536
name: $(DncEngInternalBuildPool)
36-
image: windows.vs2022.amd64
37-
os: windows
37+
demands: ImageOverride -equals windows.vs2019.amd64
3838

3939
steps:
4040
- ${{ each preStep in parameters.preSteps }}:
4141
- ${{ preStep }}
4242

4343
- task: UseDotNet@2
44-
displayName: Use .NET Core SDK 6
44+
displayName: Use .NET 8 SDK
4545
inputs:
4646
packageType: sdk
47-
version: 6.0.x
47+
version: 8.0.x
4848
installationPath: $(Agent.TempDirectory)/dotnet
4949
workingDirectory: $(Agent.TempDirectory)
5050

5151
- script: |
52-
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
53-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
52+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
53+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
5454
displayName: Download Tools
5555
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
5656
workingDirectory: $(Agent.TempDirectory)
@@ -62,7 +62,24 @@ jobs:
6262
displayName: Process Binlog into indexable sln
6363

6464
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
65-
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
66-
displayName: Upload stage1 artifacts to source index
67-
env:
68-
BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)
65+
- task: AzureCLI@2
66+
displayName: Get stage 1 auth token
67+
inputs:
68+
azureSubscription: 'SourceDotNet Stage1 Publish'
69+
addSpnToEnvironment: true
70+
scriptType: 'ps'
71+
scriptLocation: 'inlineScript'
72+
inlineScript: |
73+
echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId"
74+
echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken"
75+
echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId"
76+
77+
- script: |
78+
echo "Client ID: $(ARM_CLIENT_ID)"
79+
echo "ID Token: $(ARM_ID_TOKEN)"
80+
echo "Tenant ID: $(ARM_TENANT_ID)"
81+
az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
82+
displayName: "Login to Azure"
83+
84+
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
85+
displayName: Upload stage1 artifacts to source index

0 commit comments

Comments
 (0)