Skip to content

Commit 790c4dc

Browse files
dotnet-maestro[bot]wtgodbe
dotnet-maestro[bot]
and
wtgodbe
authored
[release/3.1] Update dependencies from dotnet/arcade (#28007)
* Update dependencies from https://github.com/dotnet/arcade build 20201119.8 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 1.0.0-beta.20509.7 -> To Version 1.0.0-beta.20569.8 * Update NuGet.config * Update NuGet.config Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: William Godbe <wigodbe@microsoft.com>
1 parent 243ae37 commit 790c4dc

File tree

7 files changed

+15
-52
lines changed

7 files changed

+15
-52
lines changed

‎NuGet.config

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,6 @@
1313
<add key="darc-pub-dotnet-extensions-2f22488" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-2f22488e/nuget/v3/index.json" />
1414
<!-- End: Package sources from dotnet-extensions -->
1515
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
16-
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
17-
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
18-
<!-- Begin: Package sources from dotnet-efcore -->
19-
<!-- End: Package sources from dotnet-efcore -->
20-
<!-- Begin: Package sources from dotnet-extensions -->
21-
<!-- End: Package sources from dotnet-extensions -->
22-
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
23-
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
24-
<!-- Begin: Package sources from dotnet-efcore -->
25-
<!-- End: Package sources from dotnet-efcore -->
26-
<!-- Begin: Package sources from dotnet-extensions -->
27-
<!-- End: Package sources from dotnet-extensions -->
28-
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
29-
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
30-
<!-- Begin: Package sources from dotnet-efcore -->
31-
<!-- End: Package sources from dotnet-efcore -->
32-
<!-- Begin: Package sources from dotnet-extensions -->
33-
<!-- End: Package sources from dotnet-extensions -->
34-
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
35-
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
36-
<!-- Begin: Package sources from dotnet-efcore -->
37-
<!-- End: Package sources from dotnet-efcore -->
38-
<!-- Begin: Package sources from dotnet-extensions -->
39-
<!-- End: Package sources from dotnet-extensions -->
40-
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
41-
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
42-
<!-- Begin: Package sources from dotnet-efcore -->
43-
<!-- End: Package sources from dotnet-efcore -->
44-
<!-- Begin: Package sources from dotnet-extensions -->
45-
<!-- End: Package sources from dotnet-extensions -->
46-
<!-- Begin: Package sources from dotnet-efcore -->
47-
<!-- End: Package sources from dotnet-efcore -->
48-
<!-- Begin: Package sources from dotnet-extensions -->
49-
<!-- End: Package sources from dotnet-extensions -->
50-
<!-- Begin: Package sources from dotnet-efcore -->
51-
<!-- End: Package sources from dotnet-efcore -->
52-
<!-- Begin: Package sources from dotnet-extensions -->
53-
<!-- End: Package sources from dotnet-extensions -->
5416
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
5517
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
5618
<add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -418,17 +418,17 @@
418418
<Uri>https://github.com/dotnet/extensions</Uri>
419419
<Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20509.7">
421+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20569.8">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>e4584b56c5334067d30a04dd6b2d1d724ed7ccc3</Sha>
423+
<Sha>c8e0cc19e7406ab0e2b2998b9c7a9249ef801b19</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20509.7">
425+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20569.8">
426426
<Uri>https://github.com/dotnet/arcade</Uri>
427-
<Sha>e4584b56c5334067d30a04dd6b2d1d724ed7ccc3</Sha>
427+
<Sha>c8e0cc19e7406ab0e2b2998b9c7a9249ef801b19</Sha>
428428
</Dependency>
429-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20509.7">
429+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20569.8">
430430
<Uri>https://github.com/dotnet/arcade</Uri>
431-
<Sha>e4584b56c5334067d30a04dd6b2d1d724ed7ccc3</Sha>
431+
<Sha>c8e0cc19e7406ab0e2b2998b9c7a9249ef801b19</Sha>
432432
</Dependency>
433433
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.11-servicing.20560.5" CoherentParentDependency="Microsoft.EntityFrameworkCore">
434434
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
-->
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/arcade -->
65-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20509.7</MicrosoftDotNetGenAPIPackageVersion>
65+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20569.8</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/core-setup -->

‎eng/common/SetupNugetSources.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,9 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
9999
function EnablePrivatePackageSources($DisabledPackageSources) {
100100
$maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
101101
ForEach ($DisabledPackageSource in $maestroPrivateSources) {
102-
Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled"
103-
$DisabledPackageSource.SetAttribute("value", "false")
102+
Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource"
103+
# Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries
104+
$DisabledPackageSources.RemoveChild($DisabledPackageSource)
104105
}
105106
}
106107

‎eng/common/SetupNugetSources.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ if [ "$?" == "0" ]; then
159159
for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do
160160
if [[ $DisabledSourceName == darc-int* ]]
161161
then
162-
OldDisableValue="add key=\"$DisabledSourceName\" value=\"true\""
163-
NewDisableValue="add key=\"$DisabledSourceName\" value=\"false\""
162+
OldDisableValue="<add key=\"$DisabledSourceName\" value=\"true\" />"
163+
NewDisableValue="<!-- Reenabled for build : $DisabledSourceName -->"
164164
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile
165165
echo "Neutralized disablePackageSources entry for '$DisabledSourceName'"
166166
fi

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
enableSourceLinkValidation: false
3-
enableSigningValidation: true
3+
enableSigningValidation: false
44
enableSymbolValidation: false
55
enableNugetValidation: true
66
publishInstallersAndChecksums: false

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.15.2",
28-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20509.7",
29-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20509.7"
28+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20569.8",
29+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20569.8"
3030
}
3131
}

0 commit comments

Comments
 (0)