Skip to content

Commit 8d7c8c3

Browse files
dsplaisteddsplaisted
committed
Merge upstream changes
# Conflicts: # eng/Version.Details.props # eng/Version.Details.xml # eng/common/core-templates/job/publish-build-assets.yml # eng/common/core-templates/post-build/post-build.yml # global.json
2 parents 68cfd9e + e0798b9 commit 8d7c8c3

16 files changed

+73
-83
lines changed

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
/p:MaestroApiEndpoint=https://maestro.dot.net
141141
/p:OfficialBuildId=$(OfficialBuildId)
142142
-runtimeSourceFeed https://ci.dot.net/internal
143-
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
143+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
144144

145145
condition: ${{ parameters.condition }}
146146
continueOnError: ${{ parameters.continueOnError }}
@@ -189,11 +189,6 @@ jobs:
189189
BARBuildId: ${{ parameters.BARBuildId }}
190190
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
191191
is1ESPipeline: ${{ parameters.is1ESPipeline }}
192-
193-
# Darc is targeting 8.0, so make sure it's installed
194-
- task: UseDotNet@2
195-
inputs:
196-
version: 8.0.x
197192

198193
- task: AzureCLI@2
199194
displayName: Publish Using Darc
@@ -210,8 +205,8 @@ jobs:
210205
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
211206
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
212207
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
213-
-runtimeSourceFeed https://ci.dot.net/internal
214-
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
208+
-runtimeSourceFeed https://ci.dot.net/internal
209+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
215210
216211
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
217212
- template: /eng/common/core-templates/steps/publish-logs.yml

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,10 +313,6 @@ stages:
313313

314314
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
315315

316-
- task: UseDotNet@2
317-
inputs:
318-
version: 8.0.x
319-
320316
- task: AzureCLI@2
321317
displayName: Publish Using Darc
322318
inputs:
@@ -334,4 +330,4 @@ stages:
334330
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
335331
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
336332
-runtimeSourceFeed https://ci.dot.net/internal
337-
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
333+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)

‎eng/common/core-templates/steps/install-microbuild.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ parameters:
1313
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
1414
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
1515
microbuildUseESRP: true
16-
# Location of the MicroBuild output folder
17-
# NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
18-
microBuildOutputFolder: '$(Build.SourcesDirectory)'
1916
# Microbuild version
2017
microbuildPluginVersion: 'latest'
2118

@@ -71,7 +68,7 @@ steps:
7168
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
7269
microbuildEnv:
7370
TeamName: $(_TeamName)
74-
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
71+
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
7572
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
7673
continueOnError: ${{ parameters.continueOnError }}
7774
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
@@ -93,7 +90,7 @@ steps:
9390
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
9491
microbuildEnv:
9592
TeamName: $(_TeamName)
96-
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
93+
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
9794
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
9895
continueOnError: ${{ parameters.continueOnError }}
9996
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))

‎es-metadata.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Docs: https://aka.ms/inventory-as-code
12
schemaVersion: 0.0.1
23
isProduction: true
34
accountableOwners:

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
88
},
99
"tools": {
10-
"dotnet": "10.0.100-rc.2.25502.107",
10+
"dotnet": "10.0.100-rc.1.25451.107",
1111
"runtimes": {
1212
"dotnet": [
1313
"$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -21,8 +21,8 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25567.101",
25-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25567.101",
24+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25521.106",
25+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25521.106",
2626
"Microsoft.Build.NoTargets": "3.7.0",
2727
"Microsoft.Build.Traversal": "3.4.0",
2828
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"

‎src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataToolsetPackageVersion)" />
5151
<PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonToolsetPackageVersion)" />
5252
<PackageReference Include="System.Diagnostics.DiagnosticSource" VersionOverride="$(SystemDiagnosticsDiagnosticSourceToolsetPackageVersion)" />
53+
<PackageReference Include="System.Memory" VersionOverride="$(SystemMemoryToolsetPackageVersion)" />
5354
</ItemGroup>
5455

5556
<!-- Only include these files in the outer build to avoid double writes. -->

‎test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallPackageAvailableFromBuiltInsWithForce.verified.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
The following template packages will be installed:
2-
Microsoft.DotNet.Common.ItemTemplates::%VERSION%
2+
Microsoft.DotNet.Common.ItemTemplates@%VERSION%
33

44
Installing the template package(s) will override the available template package(s).
55
The following template package(s) are already available:
66
Microsoft.DotNet.Common.ItemTemplates@%VERSION%
77

8-
Success: Microsoft.DotNet.Common.ItemTemplates::6.0.100 installed the following templates:
8+
Success: Microsoft.DotNet.Common.ItemTemplates@6.0.100 installed the following templates:
99
Template Name Short Name Language Tags
1010
------------------------------- ------------- -------- --------
1111
dotnet gitignore file gitignore Config

‎test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallSameSourceTwice_RemoteNuGet_WhenSourceIsSpecified.verified.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
The following template packages will be installed:
2-
Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0
2+
Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0
33

44
Microsoft.DotNet.Common.ProjectTemplates.5.0 (version 5.0.0) is already installed, it will be replaced with version 5.0.0.
5-
Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 was successfully uninstalled.
6-
Success: Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 installed the following templates:
5+
Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 was successfully uninstalled.
6+
Success: Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 installed the following templates:
77
Template Name Short Name Language Tags
88
------------------- ---------- ---------- --------------
99
Class library classlib [C#],F#,VB Common/Library

‎test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanShowDeprecationMessage_WhenLegacyCommandIsUsed_common.verified.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ For more information, run:
33
dotnet new install -h
44

55
The following template packages will be installed:
6-
Microsoft.DotNet.Web.ItemTemplates::5.0.0
6+
Microsoft.DotNet.Web.ItemTemplates@5.0.0
77

8-
Success: Microsoft.DotNet.Web.ItemTemplates::5.0.0 installed the following templates:
8+
Success: Microsoft.DotNet.Web.ItemTemplates@5.0.0 installed the following templates:
99
Template Name Short Name Language Tags
1010
-------------------- -------------- -------- -----------
1111
MVC ViewImports viewimports [C#] Web/ASP.NET

‎test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallMultiplePackageAvailableFromBuiltIns.verified.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ The following template package(s) are already available:
33
Microsoft.DotNet.Common.ItemTemplates@%VERSION%
44

55
To install the template package(s) anyway, apply '--force' option:
6-
dotnet new install Microsoft.DotNet.Common.ItemTemplates::6.0.100 Microsoft.DotNet.Web.ItemTemplates::5.0.0 --force
6+
dotnet new install Microsoft.DotNet.Common.ItemTemplates@6.0.100 Microsoft.DotNet.Web.ItemTemplates@5.0.0 --force
77

88
For details on the exit code, refer to https://aka.ms/templating-exit-codes#106

0 commit comments

Comments
 (0)