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.

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

Merging internal commits for release/7.0.1xx #14931

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
df13328
use mktemp to correctly use temp files
nagilson Aug 11, 2022
f1b49a0
Merged PR 24828: Use mktemp to correctly use temp files
nagilson Sep 13, 2022
0aad2d3
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 14, 2022
400e3fe
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 14, 2022
fc2dc63
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 14, 2022
ca57785
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 14, 2022
aaeee9b
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 15, 2022
3c048df
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 15, 2022
ccae212
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 15, 2022
fa130db
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 16, 2022
a10b664
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 16, 2022
2338fa7
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 16, 2022
5e73bc7
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 16, 2022
30018a9
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 16, 2022
01699a3
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 16, 2022
0a40380
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 16, 2022
f30c0e3
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 16, 2022
136ec17
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 16, 2022
16ceada
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 16, 2022
7639b25
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 19, 2022
f4947ac
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 20, 2022
92098c7
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 20, 2022
068a0f2
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 21, 2022
e3cba1f
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 21, 2022
fcdd11f
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 22, 2022
1b19f5b
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 22, 2022
9bb00c4
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 23, 2022
2548e6c
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 23, 2022
21dd491
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 26, 2022
549b915
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 27, 2022
082c916
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 27, 2022
5fadf94
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 28, 2022
9d827e7
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 28, 2022
9aa3eeb
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 28, 2022
34b3c40
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 28, 2022
81b5f42
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 28, 2022
b6a37a2
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 28, 2022
1aed49f
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 28, 2022
0ecf7e9
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 28, 2022
9bd218f
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 29, 2022
24c35aa
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 30, 2022
2d2d90b
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 30, 2022
54b723e
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 30, 2022
37730d5
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 30, 2022
4ae3d9b
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 30, 2022
522898c
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 30, 2022
9e5f5ee
Merge in 'release/7.0.1xx' changes
dotnet-bot Sep 30, 2022
8b68951
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 4, 2022
6d0cb55
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 5, 2022
dca55bd
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 5, 2022
a6eb8ca
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 5, 2022
dcbe600
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 6, 2022
a3391ec
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 7, 2022
b5bb0c2
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 7, 2022
e68e539
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 10, 2022
5fd8bde
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 10, 2022
57c054d
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 10, 2022
846770d
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 10, 2022
8cbd527
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 11, 2022
bde372f
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 11, 2022
536502a
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 11, 2022
661749c
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 11, 2022
8774471
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 11, 2022
e51decb
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 11, 2022
8a5b3af
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 12, 2022
64e7d43
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 12, 2022
db70a78
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 12, 2022
7895b71
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 12, 2022
fb0b3e4
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 13, 2022
cbfaafc
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 13, 2022
cd4fd1f
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 13, 2022
1288400
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 13, 2022
371154e
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 14, 2022
69e0417
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 14, 2022
6a91c43
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 14, 2022
7c84b3a
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 17, 2022
7d9eddf
Merged PR 26816: [internal/release/7.0.1xx] Update dependencies from …
dotnet-bot Oct 18, 2022
d6aa95b
Merged PR 26854: [internal/release/7.0.1xx] Update dependencies from …
dotnet-bot Oct 19, 2022
55ea5a6
Merged PR 26890: [internal/release/7.0.1xx] Update dependencies from …
dotnet-bot Oct 19, 2022
d127e47
Merged PR 26893: [internal/release/7.0.1xx] Update dependencies from …
dotnet-bot Oct 19, 2022
74ab822
Merged PR 26897: [internal/release/7.0.1xx] Update dependencies from …
dotnet-bot Oct 19, 2022
0ad8024
Merged PR 26919: [internal/release/7.0.1xx] Update dependencies from …
dotnet-bot Oct 19, 2022
5870139
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 19, 2022
abb31ae
Merge in 'release/7.0.1xx' changes
dotnet-bot Oct 19, 2022
aa03589
Merged PR 26934: [internal/release/7.0.1xx] Update dependencies from …
dotnet-bot Oct 19, 2022
0ca7203
Merged PR 26943: [internal/release/7.0.1xx] Update dependencies from …
dotnet-bot Oct 20, 2022
4e41c41
Merged PR 26944: [internal/release/7.0.1xx] Update dependencies from …
dotnet-bot Oct 20, 2022
4c8dad9
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 21, 2022
5eb1a4a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 21, 2022
18d71e1
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 21, 2022
e12b7af
Merged PR 26953: [internal/release/7.0.1xx] Update dependencies from …
dotnet-bot Oct 22, 2022
66a2e7c
Merge commit 'e12b7af219b96b5e07039ea8e3e268380329d72c' into internal…
vseanreesermsft Nov 8, 2022
817794e
Merge branch 'release/7.0.1xx' of https://github.com/dotnet/installer…
MichaelSimons Nov 10, 2022
c3c02a5
Add aspnetcore ResolvePackageFileConflicts workaround
MichaelSimons Nov 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
34 changes: 33 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,30 @@
<packageSources>
<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-bb01bbf" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-bb01bbf4/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-bb01bbf-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-bb01bbf4-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-bb01bbf-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-bb01bbf4-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-6b7d1f4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-6b7d1f4-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-6b7d1f4-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-6b7d1f4-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-18d5aef" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-18d5aef8/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-d099f07" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d099f075/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-882a576" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-882a5768/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-pub-dotnet-windowsdesktop-8a65067" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-8a650675/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-417429f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-417429fc/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-417429f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-417429fc-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-417429f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-417429fc-1/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="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
Expand All @@ -29,9 +51,19 @@
<disabledPackageSources>
<!--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-bb01bbf-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-bb01bbf-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-bb01bbf" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-d099f07" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-882a576" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-417429f-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-417429f-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-417429f" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
Expand Down
Loading