Skip to content

Commit 406fe1b

Browse files
dotnet-maestro[bot]dougbu
dotnet-maestro[bot]
and
dougbu
authored
[release/5.0-preview8] Update dependencies from dotnet/arcade (#23979)
* Update dependencies from https://github.com/dotnet/arcade build 20200714.3 Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20330.3 -> To Version 5.0.0-beta.20364.3 * Update DotNetMuxerTests.cs - skip failing test Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Doug Bunting <[email protected]>
1 parent b79190f commit 406fe1b

File tree

12 files changed

+97
-59
lines changed

12 files changed

+97
-59
lines changed

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,13 +300,13 @@
300300
<Uri>https://github.com/dotnet/runtime</Uri>
301301
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
302302
</Dependency>
303-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20330.3">
303+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20364.3">
304304
<Uri>https://github.com/dotnet/arcade</Uri>
305-
<Sha>243cc92161ad44c2a07464425892daee19121c99</Sha>
305+
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
306306
</Dependency>
307-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20330.3">
307+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20364.3">
308308
<Uri>https://github.com/dotnet/arcade</Uri>
309-
<Sha>243cc92161ad44c2a07464425892daee19121c99</Sha>
309+
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
310310
</Dependency>
311311
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-1.20361.1">
312312
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/common/SetupNugetSources.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,16 @@ $userName = "dn-bot"
128128
# Insert credential nodes for Maestro's private feeds
129129
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
130130

131-
$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']")
132-
if ($dotnet3Source -ne $null) {
133-
AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
134-
AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
135-
}
136-
137131
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
138132
if ($dotnet31Source -ne $null) {
139133
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
140134
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
141135
}
142136

137+
$dotnet5Source = $sources.SelectSingleNode("add[@key='dotnet5']")
138+
if ($dotnet5Source -ne $null) {
139+
AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
140+
AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
141+
}
142+
143143
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -79,53 +79,52 @@ fi
7979

8080
PackageSources=()
8181

82-
# Ensure dotnet3-internal and dotnet3-internal-transport are in the packageSources if the public dotnet3 feeds are present
83-
grep -i "<add key=\"dotnet3\"" $ConfigFile
84-
82+
# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present
83+
grep -i "<add key=\"dotnet3.1\"" $ConfigFile
8584
if [ "$?" == "0" ]; then
86-
grep -i "<add key=\"dotnet3-internal\">" $ConfigFile
85+
grep -i "<add key=\"dotnet3.1-internal\"" $ConfigFile
8786
if [ "$?" != "0" ]; then
88-
echo "Adding dotnet3-internal to the packageSources."
87+
echo "Adding dotnet3.1-internal to the packageSources."
8988
PackageSourcesNodeFooter="</packageSources>"
90-
PackageSourceTemplate="${TB}<add key=\"dotnet3-internal\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2\" />"
89+
PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2\" />"
9190

9291
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
9392
fi
94-
PackageSources+=('dotnet3-internal')
93+
PackageSources+=('dotnet3.1-internal')
9594

96-
grep -i "<add key=\"dotnet3-internal-transport\"" $ConfigFile
95+
grep -i "<add key=\"dotnet3.1-internal-transport\">" $ConfigFile
9796
if [ "$?" != "0" ]; then
98-
echo "Adding dotnet3-internal-transport to the packageSources."
97+
echo "Adding dotnet3.1-internal-transport to the packageSources."
9998
PackageSourcesNodeFooter="</packageSources>"
100-
PackageSourceTemplate="${TB}<add key=\"dotnet3-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2\" />"
99+
PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2\" />"
101100

102101
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
103102
fi
104-
PackageSources+=('dotnet3-internal-transport')
103+
PackageSources+=('dotnet3.1-internal-transport')
105104
fi
106105

107-
# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present
108-
grep -i "<add key=\"dotnet3.1\"" $ConfigFile
106+
# Ensure dotnet5-internal and dotnet5-internal-transport are in the packageSources if the public dotnet5 feeds are present
107+
grep -i "<add key=\"dotnet5\"" $ConfigFile
109108
if [ "$?" == "0" ]; then
110-
grep -i "<add key=\"dotnet3.1-internal\"" $ConfigFile
109+
grep -i "<add key=\"dotnet5-internal\"" $ConfigFile
111110
if [ "$?" != "0" ]; then
112-
echo "Adding dotnet3.1-internal to the packageSources."
111+
echo "Adding dotnet5-internal to the packageSources."
113112
PackageSourcesNodeFooter="</packageSources>"
114-
PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2\" />"
113+
PackageSourceTemplate="${TB}<add key=\"dotnet5-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2\" />"
115114

116115
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
117116
fi
118-
PackageSources+=('dotnet3.1-internal')
117+
PackageSources+=('dotnet5-internal')
119118

120-
grep -i "<add key=\"dotnet3.1-internal-transport\">" $ConfigFile
119+
grep -i "<add key=\"dotnet5-internal-transport\">" $ConfigFile
121120
if [ "$?" != "0" ]; then
122-
echo "Adding dotnet3.1-internal-transport to the packageSources."
121+
echo "Adding dotnet5-internal-transport to the packageSources."
123122
PackageSourcesNodeFooter="</packageSources>"
124-
PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2\" />"
123+
PackageSourceTemplate="${TB}<add key=\"dotnet5-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2\" />"
125124

126125
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
127126
fi
128-
PackageSources+=('dotnet3.1-internal-transport')
127+
PackageSources+=('dotnet5-internal-transport')
129128
fi
130129

131130
# I want things split line by line

‎eng/common/performance/performance-setup.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ if ($Internal) {
5454
$HelixSourcePrefix = "official"
5555
}
5656

57+
if($MonoInterpreter)
58+
{
59+
$ExtraBenchmarkDotNetArguments = "--category-exclusion-filter NoInterpreter"
60+
}
61+
5762
if($MonoDotnet -ne "")
5863
{
5964
$Configurations += " LLVM=$LLVM MonoInterpreter=$MonoInterpreter MonoAOT=$MonoAOT"

‎eng/common/performance/performance-setup.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@ if [[ "$mono_dotnet" != "" ]]; then
191191
configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot"
192192
fi
193193

194+
if [[ "$monointerpreter" == "true" ]]; then
195+
extra_benchmark_dotnet_arguments="--category-exclusion-filter NoInterpreter"
196+
fi
197+
194198
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
195199
setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
196200

‎eng/common/post-build/symbols-validation.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ $CountMissingSymbols = {
144144

145145
if ($MissingSymbols -ne 0)
146146
{
147-
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $MissingSymbols modules in the package $FileName"
147+
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $MissingSymbols modules in the package $PackagePath"
148148
}
149149

150150
Pop-Location

‎eng/common/templates/job/job.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ jobs:
6565
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
6666
- name: DOTNET_CLI_TELEMETRY_PROFILE
6767
value: '$(Build.Repository.Uri)'
68+
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
69+
- name: EnableRichCodeNavigation
70+
value: 'true'
6871
- ${{ each variable in parameters.variables }}:
6972
# handle name-value variable syntax
7073
# example:
@@ -124,6 +127,15 @@ jobs:
124127
- ${{ each step in parameters.steps }}:
125128
- ${{ step }}
126129

130+
- ${{ if eq(parameters.enableRichCodeNavigation, true) }}:
131+
- task: RichCodeNavIndexer@0
132+
displayName: RichCodeNav Upload
133+
inputs:
134+
languages: 'csharp'
135+
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'prod') }}
136+
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
137+
continueOnError: true
138+
127139
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
128140
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
129141
- task: MicroBuildCleanup@1

‎eng/common/templates/post-build/channels/generic-internal-channel.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ stages:
3535
pool:
3636
vmImage: 'windows-2019'
3737
steps:
38+
# This is necessary whenever we want to publish/restore to an AzDO private feed
39+
- task: NuGetAuthenticate@0
40+
displayName: 'Authenticate to AzDO Feeds'
41+
3842
- task: DownloadBuildArtifacts@0
3943
displayName: Download Build Assets
4044
continueOnError: true

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

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,16 @@ parameters:
4646
NETCoreExperimentalChannelId: 562
4747
NetEngServicesIntChannelId: 678
4848
NetEngServicesProdChannelId: 679
49-
Net5Preview5ChannelId: 857
50-
Net5Preview6ChannelId: 1013
5149
Net5Preview7ChannelId: 1065
50+
Net5Preview8ChannelId: 1155
51+
Net5RC1ChannelId: 1157
5252
NetCoreSDK313xxChannelId: 759
5353
NetCoreSDK313xxInternalChannelId: 760
5454
NetCoreSDK314xxChannelId: 921
5555
NetCoreSDK314xxInternalChannelId: 922
5656
VS166ChannelId: 1010
5757
VS167ChannelId: 1011
58+
VS168ChannelId: 1154
5859
VSMasterChannelId: 1012
5960

6061
stages:
@@ -114,7 +115,7 @@ stages:
114115
inputs:
115116
filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
116117
arguments: -PromoteToChannels "$(TargetChannels)"
117-
-AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview5ChannelId}},${{parameters.Net5Preview6ChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VSMasterChannelId}}
118+
-AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
118119

119120
- job:
120121
displayName: NuGet Validation
@@ -275,41 +276,41 @@ stages:
275276
dependsOn: ${{ parameters.publishDependsOn }}
276277
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
277278
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
278-
stageName: 'Net5_Preview5_Publish'
279-
channelName: '.NET 5 Preview 5'
280-
akaMSChannelName: 'net5/preview5'
281-
channelId: ${{ parameters.Net5Preview5ChannelId }}
279+
stageName: 'Net5_Preview7_Publish'
280+
channelName: '.NET 5 Preview 7'
281+
akaMSChannelName: 'net5/preview7'
282+
channelId: ${{ parameters.Net5Preview7ChannelId }}
282283
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
283284
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
284285
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
285286

286-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
287+
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
287288
parameters:
288289
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
289290
dependsOn: ${{ parameters.publishDependsOn }}
290291
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
291292
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
292-
stageName: 'Net5_Preview6_Publish'
293-
channelName: '.NET 5 Preview 6'
294-
akaMSChannelName: 'net5/preview6'
295-
channelId: ${{ parameters.Net5Preview6ChannelId }}
296-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
297-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
298-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
293+
stageName: 'Net5_Preview8_Publish'
294+
channelName: '.NET 5 Preview 8'
295+
akaMSChannelName: 'net5/preview8'
296+
channelId: ${{ parameters.Net5Preview8ChannelId }}
297+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json'
298+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json'
299+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json'
299300

300-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
301+
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
301302
parameters:
302303
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
303304
dependsOn: ${{ parameters.publishDependsOn }}
304305
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
305306
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
306-
stageName: 'Net5_Preview7_Publish'
307-
channelName: '.NET 5 Preview 7'
308-
akaMSChannelName: 'net5/preview7'
309-
channelId: ${{ parameters.Net5Preview7ChannelId }}
310-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
311-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
312-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
307+
stageName: 'Net5_RC1_Publish'
308+
channelName: '.NET 5 RC 1'
309+
akaMSChannelName: 'net5/rc1'
310+
channelId: ${{ parameters.Net5RC1ChannelId }}
311+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json'
312+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json'
313+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json'
313314

314315
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
315316
parameters:
@@ -509,6 +510,19 @@ stages:
509510
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
510511
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
511512

513+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
514+
parameters:
515+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
516+
dependsOn: ${{ parameters.publishDependsOn }}
517+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
518+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
519+
stageName: 'VS16_8_Publishing'
520+
channelName: 'VS 16.8'
521+
channelId: ${{ parameters.VS168ChannelId }}
522+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
523+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
524+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
525+
512526
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
513527
parameters:
514528
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}

‎eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
385385
Create-Directory $packageDir
386386
Write-Host "Downloading $packageName $packageVersion"
387387
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
388-
Invoke-WebRequest "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/$packageName/$packageVersion/" -OutFile $packagePath
388+
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
389389
Unzip $packagePath $packageDir
390390
}
391391

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.15.2",
33-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20330.3",
34-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20330.3"
33+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3",
34+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3"
3535
}
3636
}

‎src/Shared/test/Shared.Tests/DotNetMuxerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Microsoft.Extensions.CommandLineUtils
1010
{
1111
public class DotNetMuxerTests
1212
{
13-
[Fact]
13+
[Fact(Skip="https://github.com/dotnet/aspnetcore/issues/24082")]
1414
public void FindsTheMuxer()
1515
{
1616
var muxerPath = DotNetMuxer.MuxerPath;

0 commit comments

Comments
 (0)