Skip to content

Commit f78cba5

Browse files
Update dependencies from https://github.com/dotnet/dotnet build 290847 (#2737)
Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25563.104 -> 11.0.0-beta.25563.103) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent c7cc2a9 commit f78cba5

27 files changed

+371
-332
lines changed

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25563.104</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25563.103</MicrosoftDotNetArcadeSdkPackageVersion>
1010
</PropertyGroup>
1111
<!--Property group for alternate package version names-->
1212
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="77ee357638bcd8fa66a1c16fa588dcd5818068d2" BarId="289869" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="679ec822750ef4a645af43de164852f3c7ed9fdc" BarId="290847" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25563.104">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25563.103">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
9+
<Sha>679ec822750ef4a645af43de164852f3c7ed9fdc</Sha>
1010
</Dependency>
1111
</ToolsetDependencies>
1212
</Dependencies>

eng/common/SetupNugetSources.ps1

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
2-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
3-
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
4-
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
2+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
3+
# disabled internal Maestro (darc-int*) feeds.
54
#
65
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
76
#
@@ -174,16 +173,4 @@ foreach ($dotnetVersion in $dotnetVersions) {
174173
}
175174
}
176175

177-
# Check for dotnet-eng and add dotnet-eng-internal if present
178-
$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']")
179-
if ($dotnetEngSource -ne $null) {
180-
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
181-
}
182-
183-
# Check for dotnet-tools and add dotnet-tools-internal if present
184-
$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
185-
if ($dotnetToolsSource -ne $null) {
186-
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
187-
}
188-
189176
$doc.Save($filename)

eng/common/SetupNugetSources.sh

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#!/usr/bin/env bash
22

33
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
4-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
5-
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
6-
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
4+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
5+
# disabled internal Maestro (darc-int*) feeds.
76
#
87
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
98
#
@@ -174,18 +173,6 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
174173
fi
175174
done
176175

177-
# Check for dotnet-eng and add dotnet-eng-internal if present
178-
grep -i "<add key=\"dotnet-eng\"" $ConfigFile > /dev/null
179-
if [ "$?" == "0" ]; then
180-
AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix"
181-
fi
182-
183-
# Check for dotnet-tools and add dotnet-tools-internal if present
184-
grep -i "<add key=\"dotnet-tools\"" $ConfigFile > /dev/null
185-
if [ "$?" == "0" ]; then
186-
AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix"
187-
fi
188-
189176
# I want things split line by line
190177
PrevIFS=$IFS
191178
IFS=$'\n'

eng/common/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ runtime_source_feed=''
9292
runtime_source_feed_key=''
9393

9494
properties=()
95-
while [[ $# > 0 ]]; do
95+
while [[ $# -gt 0 ]]; do
9696
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
9797
case "$opt" in
9898
-help|-h)

eng/common/core-templates/job/job.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ parameters:
1919
# publishing defaults
2020
artifacts: ''
2121
enableMicrobuild: false
22+
enablePreviewMicrobuild: false
23+
microbuildPluginVersion: 'latest'
2224
enableMicrobuildForMacAndLinux: false
2325
microbuildUseESRP: true
2426
enablePublishBuildArtifacts: false
@@ -128,6 +130,8 @@ jobs:
128130
- template: /eng/common/core-templates/steps/install-microbuild.yml
129131
parameters:
130132
enableMicrobuild: ${{ parameters.enableMicrobuild }}
133+
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
134+
microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
131135
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
132136
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
133137
continueOnError: ${{ parameters.continueOnError }}
@@ -153,6 +157,8 @@ jobs:
153157
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
154158
parameters:
155159
enableMicrobuild: ${{ parameters.enableMicrobuild }}
160+
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
161+
microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
156162
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
157163
continueOnError: ${{ parameters.continueOnError }}
158164

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

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ jobs:
9191
fetchDepth: 3
9292
clean: true
9393

94-
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
95-
- ${{ if eq(parameters.publishingVersion, 3) }}:
94+
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
95+
- ${{ if eq(parameters.publishingVersion, 3) }}:
9696
- task: DownloadPipelineArtifact@2
9797
displayName: Download Asset Manifests
9898
inputs:
@@ -117,9 +117,16 @@ jobs:
117117
flattenFolders: true
118118
condition: ${{ parameters.condition }}
119119
continueOnError: ${{ parameters.continueOnError }}
120-
120+
121121
- task: NuGetAuthenticate@1
122122

123+
# Populate internal runtime variables.
124+
- template: /eng/common/templates/steps/enable-internal-sources.yml
125+
parameters:
126+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
127+
128+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
129+
123130
- task: AzureCLI@2
124131
displayName: Publish Build Assets
125132
inputs:
@@ -132,9 +139,12 @@ jobs:
132139
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
133140
/p:MaestroApiEndpoint=https://maestro.dot.net
134141
/p:OfficialBuildId=$(OfficialBuildId)
142+
-runtimeSourceFeed https://ci.dot.net/internal
143+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
144+
135145
condition: ${{ parameters.condition }}
136146
continueOnError: ${{ parameters.continueOnError }}
137-
147+
138148
- task: powershell@2
139149
displayName: Create ReleaseConfigs Artifact
140150
inputs:
@@ -162,7 +172,7 @@ jobs:
162172
artifactName: AssetManifests
163173
displayName: 'Publish Merged Manifest'
164174
retryCountOnTaskFailure: 10 # for any logs being locked
165-
sbomEnabled: false # we don't need SBOM for logs
175+
sbomEnabled: false # we don't need SBOM for logs
166176

167177
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
168178
parameters:
@@ -179,7 +189,7 @@ jobs:
179189
BARBuildId: ${{ parameters.BARBuildId }}
180190
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
181191
is1ESPipeline: ${{ parameters.is1ESPipeline }}
182-
192+
183193
# Darc is targeting 8.0, so make sure it's installed
184194
- task: UseDotNet@2
185195
inputs:
@@ -200,9 +210,11 @@ jobs:
200210
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
201211
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
202212
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
213+
-runtimeSourceFeed https://ci.dot.net/internal
214+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
203215
204216
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
205217
- template: /eng/common/core-templates/steps/publish-logs.yml
206218
parameters:
207219
is1ESPipeline: ${{ parameters.is1ESPipeline }}
208-
JobLabel: 'Publish_Artifacts_Logs'
220+
JobLabel: 'Publish_Artifacts_Logs'

eng/common/core-templates/job/source-build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ parameters:
3434
# container and pool.
3535
platform: {}
3636

37-
# Optional list of directories to ignore for component governance scans.
38-
componentGovernanceIgnoreDirectories: []
39-
4037
is1ESPipeline: ''
4138

4239
# If set to true and running on a non-public project,
@@ -97,4 +94,3 @@ jobs:
9794
parameters:
9895
is1ESPipeline: ${{ parameters.is1ESPipeline }}
9996
platform: ${{ parameters.platform }}
100-
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

eng/common/core-templates/job/source-index-stage1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ jobs:
4141

4242
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
4343
parameters:
44-
binLogPath: ${{ parameters.binLogPath }}
44+
binLogPath: ${{ parameters.binLogPath }}

eng/common/core-templates/jobs/source-build.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ parameters:
1515
# one job runs on 'defaultManagedPlatform'.
1616
platforms: []
1717

18-
# Optional list of directories to ignore for component governance scans.
19-
componentGovernanceIgnoreDirectories: []
20-
2118
is1ESPipeline: ''
2219

2320
# If set to true and running on a non-public project,
@@ -34,7 +31,6 @@ jobs:
3431
is1ESPipeline: ${{ parameters.is1ESPipeline }}
3532
jobNamePrefix: ${{ parameters.jobNamePrefix }}
3633
platform: ${{ platform }}
37-
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
3834
enableInternalSources: ${{ parameters.enableInternalSources }}
3935

4036
- ${{ if eq(length(parameters.platforms), 0) }}:
@@ -43,5 +39,4 @@ jobs:
4339
is1ESPipeline: ${{ parameters.is1ESPipeline }}
4440
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4541
platform: ${{ parameters.defaultManagedPlatform }}
46-
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
4742
enableInternalSources: ${{ parameters.enableInternalSources }}

0 commit comments

Comments
 (0)