Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merging internal commits for release/6.0.4xx #28470

Merged
merged 43 commits into from
Oct 14, 2022
Merged

Merging internal commits for release/6.0.4xx #28470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
daab954
Merge in 'release/6.0.4xx' changes
dotnet-bot Aug 26, 2022
e4044b6
Merge in 'release/6.0.4xx' changes
dotnet-bot Aug 29, 2022
fdde463
Merge in 'release/6.0.4xx' changes
dotnet-bot Sep 1, 2022
f0fc98e
Merge in 'release/6.0.4xx' changes
dotnet-bot Sep 2, 2022
3e692e4
Merge in 'release/6.0.4xx' changes
dotnet-bot Sep 6, 2022
27b6fb7
Merge in 'release/6.0.4xx' changes
dotnet-bot Sep 6, 2022
4bf3f18
Merge in 'release/6.0.4xx' changes
dotnet-bot Sep 6, 2022
59d934b
Merge in 'release/6.0.4xx' changes
dotnet-bot Sep 7, 2022
b2456d9
Merge in 'release/6.0.4xx' changes
dotnet-bot Sep 7, 2022
fa923a6
Merge in 'release/6.0.4xx' changes
dotnet-bot Sep 7, 2022
2dedad8
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 7, 2022
104ae92
[Backport] Fix Temp Paths for MSRC
nagilson Sep 7, 2022
8bbea4f
Remove localizablestrings from patch
nagilson Sep 7, 2022
0eee0f6
Additional security patch for 6.0.4xx specifically
nagilson Sep 7, 2022
1eb7b6a
Additional fixes for 6.0.4xx specifically
nagilson Sep 7, 2022
7a0e029
Dont take usings merge
nagilson Sep 7, 2022
50e767a
Merge in 'release/6.0.4xx' changes
dotnet-bot Sep 9, 2022
10149c6
Merged PR 25600: [Backport] 6.0.4xx Temp Path Changes
nagilson Sep 12, 2022
be49c1b
Merge in 'release/6.0.4xx' changes
dotnet-bot Sep 13, 2022
34931ed
Merged PR 25671: Insert nuget.client 6.3.1-rc.1 to dotnet sdk 6.0.4xx
Sep 13, 2022
417b4a5
Merged PR 25578: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Sep 13, 2022
3d41986
Merge in 'release/6.0.4xx' changes
dotnet-bot Sep 13, 2022
e402e6e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
f388773
Merge in 'release/6.0.4xx' changes
dotnet-bot Sep 14, 2022
1c174ec
update msbuild version
Forgind Sep 14, 2022
e901145
nuget.config update?
Forgind Sep 14, 2022
3433ba2
Merged PR 25752: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Sep 14, 2022
255b6c4
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
e0d60e3
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2022
4f4aae6
Merged PR 25799: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Sep 14, 2022
a3eb3d7
pull in release/6.0.4xx
Forgind Sep 15, 2022
954a276
nuget.config update
Forgind Sep 15, 2022
e87a77f
Merge from public
mmitche Sep 19, 2022
c3e567c
Merged PR 25783: Flow MSRC bits
Forgind Sep 19, 2022
2d0d15c
Merged PR 25941: Merge from public
mmitche Sep 19, 2022
cf925f7
Merge in 'release/6.0.4xx' changes
dotnet-bot Sep 20, 2022
104cf6c
Merged PR 25872: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Sep 20, 2022
c252faf
Merged PR 26020: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Sep 20, 2022
da945c9
Merged PR 26196: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Sep 26, 2022
063bbf6
Merged PR 26219: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Sep 27, 2022
5c32506
Merged PR 26225: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Sep 27, 2022
6a37511
Merged PR 26233: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Sep 27, 2022
bd3d691
Merge commit '6a3751154ef2a5ab57d4bc3b62c5c8fa2d278ce6' into internal…
vseanreesermsft Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,26 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-32e8c8c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-32e8c8ca/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-int-DotNet-msbuild-Trusted-5618488" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-56184888/nuget/v3/index.json" />
<add key="darc-int-DotNet-msbuild-Trusted-5618488-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-56184888-5/nuget/v3/index.json" />
<add key="darc-int-DotNet-msbuild-Trusted-5618488-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-56184888-4/nuget/v3/index.json" />
<add key="darc-int-DotNet-msbuild-Trusted-5618488-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-56184888-3/nuget/v3/index.json" />
<add key="darc-int-DotNet-msbuild-Trusted-5618488-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-56184888-2/nuget/v3/index.json" />
<add key="darc-int-DotNet-msbuild-Trusted-5618488-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-56184888-1/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
<!-- End: Package sources from dotnet-roslyn-analyzers -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-5a400c2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5a400c21/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-32a619c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-32a619c8/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-74607da" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-74607da1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
Expand All @@ -30,13 +40,25 @@
</packageSources>
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-int-DotNet-msbuild-Trusted-5618488-1" value="true" />
<add key="darc-int-DotNet-msbuild-Trusted-5618488-2" value="true" />
<add key="darc-int-DotNet-msbuild-Trusted-5618488-3" value="true" />
<add key="darc-int-DotNet-msbuild-Trusted-5618488-4" value="true" />
<add key="darc-int-DotNet-msbuild-Trusted-5618488-5" value="true" />
<add key="darc-int-DotNet-msbuild-Trusted-5618488" value="true" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-32a619c" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-32e8c8c" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-5a400c2" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-74607da" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
Loading