Skip to content

Commit 20650be

Browse files
dseefelddseefeld
committed
Update from BAR Build ID 84775 - NuGet.Client fix
1 parent f26e6c7 commit 20650be

File tree

4 files changed

+41
-16
lines changed

4 files changed

+41
-16
lines changed

‎NuGet.config

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@
77
<add key="darc-pub-dotnet-roslyn-analyzers-ce71b27" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-ce71b27b/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-roslyn-analyzers -->
99
<!-- Begin: Package sources from dotnet-runtime -->
10+
<add key="darc-int-dotnet-runtime-2f740ad-5" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-5/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-runtime-2f740ad-4" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-4/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-2f740ad-3" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-3/nuget/v3/index.json" />
1013
<add key="darc-int-dotnet-runtime-2f740ad" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc/nuget/v3/index.json" />
1114
<!-- End: Package sources from dotnet-runtime -->
1215
<!-- Begin: Package sources from dotnet-templating -->
16+
<add key="darc-pub-dotnet-templating-8470ff3-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-4/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-templating-8470ff3-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-3/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-templating-8470ff3-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-2/nuget/v3/index.json" />
1319
<add key="darc-pub-dotnet-templating-8470ff3-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-1/nuget/v3/index.json" />
1420
<add key="darc-pub-dotnet-templating-8470ff3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json" />
1521
<!-- End: Package sources from dotnet-templating -->
@@ -18,10 +24,5 @@
1824
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1925
</packageSources>
2026
<disabledPackageSources>
21-
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
22-
<!-- Begin: Package sources from dotnet-runtime -->
23-
<add key="darc-int-dotnet-runtime-2f740ad" value="true" />
24-
<!-- End: Package sources from dotnet-runtime -->
25-
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2627
</disabledPackageSources>
2728
</configuration>

‎build.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,15 @@ if [ "${internalPackageFeedPat:-}" ]; then
109109
# The internal transport isn't added by Darc, though, so it will still need special-casing.
110110
export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [
111111
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-ce71b27b/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
112+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-5/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
113+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-4/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
114+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-3/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
112115
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
113-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
114-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
116+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-4/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
117+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-3/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
118+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
119+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
120+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
115121
]}'
116122
fi
117123

‎eng/Version.Details.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@
5858
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
5959
<Sha>ce71b27be743710012c0460071da188b2f05959c</Sha>
6060
</Dependency>
61-
<Dependency Name="NuGet.Build.Tasks" Version="5.9.1-rc.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
62-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
63-
<Sha>fad4343fa8ba919bb8a1b86bb22310824bf14268</Sha>
61+
<Dependency Name="NuGet.Build.Tasks" Version="5.9.1-rc.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
62+
<Uri>https://github.com/nuget/nuget.client</Uri>
63+
<Sha>d525b0e670f3b6cbd5c73a35f04730a9f658c852</Sha>
6464
<RepoName>nuget-client</RepoName>
6565
</Dependency>
66-
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.202-servicing.21172.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
66+
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.202-servicing.21201.17" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
6767
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
68-
<Sha>461a94d08054f1b683ef2855c18acf9de0e1175c</Sha>
68+
<Sha>51369266643769f9f0c1184e89715cd1045126d0</Sha>
6969
<RepoName>sdk</RepoName>
7070
</Dependency>
7171
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
@@ -92,13 +92,13 @@
9292
<Uri>https://github.com/dotnet/fsharp</Uri>
9393
<Sha>7ce7132f1459095e635194d09d6f73265352029a</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.1-release-20210308-01" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
95+
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
9696
<Uri>https://github.com/microsoft/vstest</Uri>
97-
<Sha>6a858a323caa439115e9e3cf1c958b04f4ff9993</Sha>
97+
<Sha>99b911a57a02fc5d2eeef23e9ab8cbea4505678b</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.202-servicing.21172.7">
99+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.202-servicing.21201.18">
100100
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-installer</Uri>
101-
<Sha>3346fa974fffdbb431685520cce0ff793568499a</Sha>
101+
<Sha>db7cc87d512335808e3806067f2bf9b31379e1db</Sha>
102102
<RepoName>installer</RepoName>
103103
</Dependency>
104104
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.20419.2">

‎smoke-testNuGet.Config

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22
<configuration>
33
<packageSources>
44
<clear />
5+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
7+
<add key="darc-pub-dotnet-roslyn-analyzers-ce71b27" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-ce71b27b/nuget/v3/index.json" />
8+
<!-- End: Package sources from dotnet-roslyn-analyzers -->
9+
<!-- Begin: Package sources from dotnet-runtime -->
10+
<add key="darc-int-dotnet-runtime-2f740ad-5" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-5/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-runtime-2f740ad-4" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-4/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-2f740ad-3" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-3/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-runtime-2f740ad" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc/nuget/v3/index.json" />
14+
<!-- End: Package sources from dotnet-runtime -->
15+
<!-- Begin: Package sources from dotnet-templating -->
16+
<add key="darc-pub-dotnet-templating-8470ff3-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-4/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-templating-8470ff3-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-3/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-templating-8470ff3-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-2/nuget/v3/index.json" />
19+
<add key="darc-pub-dotnet-templating-8470ff3-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-1/nuget/v3/index.json" />
20+
<add key="darc-pub-dotnet-templating-8470ff3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json" />
21+
<!-- End: Package sources from dotnet-templating -->
22+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
523
<add key="source-built-packages" value="SOURCE_BUILT_PACKAGES" />
624
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
725
</packageSources>

0 commit comments

Comments
 (0)