Skip to content

Commit 754ee69

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into darc-release/8.0.3xx-0065e091-8007-4b6e-afea-fee5b1d7f830
2 parents a290572 + 850f919 commit 754ee69

29 files changed

+575
-234
lines changed

‎.vsts-ci-richnav.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ stages:
2626
richCodeNavigationEnvironment: 'production'
2727
pool:
2828
name: $(DncEngPublicBuildPool)
29-
demands: ImageOverride -equals windows.vs2019.amd64.open
29+
demands: ImageOverride -equals windows.vs2019.amd64.open
3030
timeoutInMinutes: 180
3131
strategy:
3232
matrix:
@@ -45,6 +45,7 @@ stages:
4545
- _SignArgs: ''
4646
- _InternalRuntimeDownloadArgs: ''
4747
steps:
48+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
4849
- powershell: eng\common\build.ps1
4950
-restore
5051
-ci
@@ -65,23 +66,23 @@ stages:
6566
TestFullMSBuild: 'true'
6667
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6768

68-
- task: CopyFiles@2
69-
displayName: Gather Logs
70-
inputs:
71-
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
72-
Contents: |
73-
log/$(_BuildConfig)/**/*
74-
TestResults/$(_BuildConfig)/**/*
75-
SymStore/$(_BuildConfig)/**/*
76-
TargetFolder: '$(Build.ArtifactStagingDirectory)'
77-
continueOnError: true
69+
- task: CopyFiles@2
70+
displayName: Gather Logs
71+
inputs:
72+
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
73+
Contents: |
74+
log/$(_BuildConfig)/**/*
75+
TestResults/$(_BuildConfig)/**/*
76+
SymStore/$(_BuildConfig)/**/*
77+
TargetFolder: '$(Build.ArtifactStagingDirectory)'
78+
continueOnError: true
7879
condition: always()
7980

80-
- task: PublishBuildArtifacts@1
81-
displayName: Publish Logs to VSTS
82-
inputs:
83-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
84-
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
85-
publishLocation: Container
86-
continueOnError: true
81+
- task: PublishBuildArtifacts@1
82+
displayName: Publish Logs to VSTS
83+
inputs:
84+
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
85+
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
86+
publishLocation: Container
87+
continueOnError: true
8788
condition: always()

‎.vsts-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ variables:
3636
value: /p:OfficialBuilder=Microsoft
3737
- name: Codeql.Enabled
3838
value: true
39-
- group: DotNetBuilds storage account read tokens
4039
- name: _InternalRuntimeDownloadArgs
41-
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
42-
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
40+
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
41+
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
4342
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
4443
- group: DotNet-CLI-SDLValidation-Params
4544
- template: /eng/common/templates-official/variables/pool-providers.yml
@@ -115,6 +114,7 @@ extends:
115114
value: ''
116115
- template: /eng/common/templates-official/job/source-build.yml@self
117116
parameters:
117+
enableInternalSources: true
118118
platform:
119119
name: 'Managed'
120120
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'

‎.vsts-pr.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,8 @@ pr:
1818
variables:
1919
- name: teamName
2020
value: Roslyn-Project-System
21-
- name: _DotNetPublishToBlobFeed
22-
value: false
2321
- name: _CIBuild
2422
value: -restore -build -sign -pack -ci
25-
- name: _DotNetArtifactsCategory
26-
value: .NETCore
27-
- name: _DotNetValidationArtifactsCategory
28-
value: .NETCore
2923
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
3024
- name: PostBuildSign
3125
value: false
@@ -44,10 +38,9 @@ variables:
4438
value: /p:OfficialBuilder=Microsoft
4539
- name: Codeql.Enabled
4640
value: true
47-
- group: DotNetBuilds storage account read tokens
4841
- name: _InternalRuntimeDownloadArgs
49-
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
50-
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
42+
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
43+
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
5144
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
5245
- group: DotNet-CLI-SDLValidation-Params
5346
- template: /eng/common/templates/variables/pool-providers.yml
@@ -64,9 +57,9 @@ stages:
6457
name: $(DncEngInternalBuildPool)
6558
demands: ImageOverride -equals windows.vs2019.amd64
6659
steps:
67-
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
68-
artifact: BuildConfiguration
69-
displayName: Publish Build Config
60+
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
61+
artifact: BuildConfiguration
62+
displayName: Publish Build Config
7063
- template: /eng/build-pr.yml
7164
parameters:
7265
agentOs: Windows_NT
@@ -94,6 +87,7 @@ stages:
9487
_Test: ''
9588
- template: /eng/common/templates/job/source-build.yml
9689
parameters:
90+
enableInternalSources: true
9791
platform:
9892
name: 'Managed'
9993
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'

‎NuGet.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
<!-- End: Package sources from dotnet-runtime -->
2525
<!-- Begin: Package sources from dotnet-templating -->
2626
<add key="darc-pub-dotnet-templating-2c8137b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2c8137bd/nuget/v3/index.json" />
27+
<add key="darc-pub-dotnet-templating-7248c3c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7248c3c1/nuget/v3/index.json" />
28+
<add key="darc-pub-dotnet-templating-7248c3c-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7248c3c1-5/nuget/v3/index.json" />
29+
<add key="darc-pub-dotnet-templating-7248c3c-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7248c3c1-3/nuget/v3/index.json" />
30+
<add key="darc-pub-dotnet-templating-7248c3c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7248c3c1-2/nuget/v3/index.json" />
31+
<add key="darc-pub-dotnet-templating-7248c3c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7248c3c1-1/nuget/v3/index.json" />
2732
<!-- End: Package sources from dotnet-templating -->
2833
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2934
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -285,18 +285,18 @@
285285
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
286286
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
287287
</Dependency>
288-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24312.2">
288+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24326.2">
289289
<Uri>https://github.com/dotnet/razor</Uri>
290-
<Sha>c0bfb39f2018d2c077798ac992c799929df1453f</Sha>
290+
<Sha>6f2caf542643b6c72369e41172572015d8f48311</Sha>
291291
<SourceBuild RepoName="razor" ManagedOnly="true" />
292292
</Dependency>
293-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24312.2">
293+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24326.2">
294294
<Uri>https://github.com/dotnet/razor</Uri>
295-
<Sha>c0bfb39f2018d2c077798ac992c799929df1453f</Sha>
295+
<Sha>6f2caf542643b6c72369e41172572015d8f48311</Sha>
296296
</Dependency>
297-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24312.2">
297+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24326.2">
298298
<Uri>https://github.com/dotnet/razor</Uri>
299-
<Sha>c0bfb39f2018d2c077798ac992c799929df1453f</Sha>
299+
<Sha>6f2caf542643b6c72369e41172572015d8f48311</Sha>
300300
</Dependency>
301301
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.5">
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -483,22 +483,22 @@
483483
</Dependency>
484484
</ProductDependencies>
485485
<ToolsetDependencies>
486-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24310.5">
486+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24352.1">
487487
<Uri>https://github.com/dotnet/arcade</Uri>
488-
<Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
488+
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
489489
<SourceBuild RepoName="arcade" ManagedOnly="true" />
490490
</Dependency>
491-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24310.5">
491+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24352.1">
492492
<Uri>https://github.com/dotnet/arcade</Uri>
493-
<Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
493+
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
494494
</Dependency>
495-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24310.5">
495+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24352.1">
496496
<Uri>https://github.com/dotnet/arcade</Uri>
497-
<Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
497+
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24310.5">
499+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24352.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
501+
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
502502
</Dependency>
503503
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0">
504504
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212
<!-- Repo Version Information -->
1313
<PropertyGroup>
14-
<VersionPrefix>8.0.303</VersionPrefix>
14+
<VersionPrefix>8.0.304</VersionPrefix>
1515
<WorkloadsFeatureBand>8.0.300</WorkloadsFeatureBand>
1616
<!-- Enable to remove prerelease label. -->
1717
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
@@ -35,7 +35,7 @@
3535
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3636
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3737
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
38-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24310.5</MicrosoftDotNetSignToolVersion>
38+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24352.1</MicrosoftDotNetSignToolVersion>
3939
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4040
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4141
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -176,9 +176,9 @@
176176
</PropertyGroup>
177177
<!-- Dependencies from https://github.com/dotnet/razor -->
178178
<PropertyGroup>
179-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.24312.2</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
180-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24312.2</MicrosoftCodeAnalysisRazorToolingInternalVersion>
181-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24312.2</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
179+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.24326.2</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
180+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24326.2</MicrosoftCodeAnalysisRazorToolingInternalVersion>
181+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24326.2</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
182182
</PropertyGroup>
183183
<PropertyGroup>
184184
<!-- Dependencies from https://github.com/dotnet/wpf -->
@@ -210,7 +210,7 @@
210210
<PropertyGroup>
211211
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
212212
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
213-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24310.5</MicrosoftDotNetXUnitExtensionsVersion>
213+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24352.1</MicrosoftDotNetXUnitExtensionsVersion>
214214
<MoqPackageVersion>4.18.4</MoqPackageVersion>
215215
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
216216
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

0 commit comments

Comments
 (0)