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

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' #20189

Merged
merged 74 commits into from
Oct 14, 2024
Merged

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' #20189

Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
164b7bd
Merge commit '412d1e86c5e56db275cbc0d0def41304cb2edb32'
Aug 7, 2024
d693472
Merge commit '550869d49fc7b77c835f3dbe71518b9aad48fdcb'
Aug 7, 2024
491fd12
Merge commit 'e753d799b986b7e0873330f529f5f1e3a669adc9'
Aug 7, 2024
3e6ef54
Merge commit '632c9bd5a812d9a8854ba8a7cc1ac66f2a01ce48'
Aug 7, 2024
0c94930
Merge commit 'dc7a330f651df44966b2630e039ba67ac74f6482'
Aug 7, 2024
705b73c
Merge commit '520a4442a94ca886abef61bfaa93cc83560df257'
Aug 12, 2024
ae4509c
Merge commit 'd616f12736f34811403afea566f81198bc98b078'
Aug 13, 2024
768425d
Merge commit 'fc9fe8339ee558112143afba5974eb7d81e84e7f'
Aug 13, 2024
454b7e1
Merge commit 'fb5b500eb851e76e03d3679f42c93a48b7c73df0'
Aug 13, 2024
6f7bd53
Merge commit '4c4de18fa4365613b2e576375f99d6ca641cb646'
Aug 13, 2024
0b80933
Merge commit '4e44aaeca3533a6dc079e14c37290405f1e037cf'
Aug 14, 2024
c92d8e1
Merge commit '1ec3ff254c2ef14682bc7a6f8c75bd02ab0e8fb2'
Aug 14, 2024
b9cd395
Merge commit '285ca33638632027cb08c7fa19c9f8a59f2b546f'
Aug 14, 2024
9dbea83
Merge commit 'b5317ba1fcec286f06c20d937ab9b41e39549f49'
Aug 15, 2024
631f2fd
Merge commit '909f9bd8203d14bbda346b6558be02a0980f5051'
Aug 15, 2024
8ee7d74
Merge commit '228439883bb1e63c5ada8970608fc30a82bdaebb'
Aug 16, 2024
cd0d7b4
Merged PR 41531: [internal/release/6.0.4xx] Update dependencies from …
Aug 16, 2024
09a14fe
Merged PR 41822: [internal/release/8.0.1xx] Update dependencies from …
Aug 17, 2024
0a32d15
Merged PR 41862: Update MsftToSbSdkFiles.diff
ellahathaway Aug 19, 2024
87b1996
Merge commit '6e9002c2efcfc09687feca31864ebc987c3c9ec8'
Aug 19, 2024
d4465ef
Merged PR 41823: [internal/release/6.0.4xx] Update dependencies from …
Aug 20, 2024
597f5ad
Merged PR 41921: [internal/release/8.0.1xx] Update dependencies from …
Aug 21, 2024
87ff46e
Merge commit 'a4cb8f29d824472c1c5bc1f7c5f914a8b15aab26'
Aug 29, 2024
6c05e45
Merge commit '7486036364c56f2942c7efed048a0425e7125aa7'
Sep 4, 2024
c0e4997
Merge commit '7bd932a861b307866a67f2c9e89075c358f364cf'
Sep 4, 2024
5b4539c
Merge commit 'e6e0c36b3283b0eaff550ec0140db630c26e29e0'
Sep 4, 2024
a6afabb
Merge commit '769b517b3fb1482bb84d55150a602b4c43669a1f'
Sep 9, 2024
dc87f5d
Merge commit 'd5df754fb02bc3ea14425d59a101427252d98078'
Sep 9, 2024
4b1dfe8
Merge commit 'b9e579492394e1b92f71d8af4caba0f6cd0d62b5'
Sep 9, 2024
eb549b1
Merge commit 'b650301e52dd5faa0d880e50e904d8fdc197cad7'
Sep 9, 2024
2a401ac
Merge commit '55e374f1fc149e17f4093ef8a585e6cf998f454f'
Sep 10, 2024
bea352b
Merge commit 'df0a3e7960278273bcf911cac1a6bb269a57e7a9'
Sep 10, 2024
3cdeb44
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 10, 2024
d114f30
Merged PR 42714: [internal/release/6.0.4xx] Update dependencies from …
Sep 11, 2024
1ff85d9
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 11, 2024
7d2b854
Merged PR 42747: [internal/release/6.0.4xx] Update dependencies from …
Sep 12, 2024
892ed04
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
20eb419
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
c15f18f
Merge commit '2bb95a16ebf7b86bf16a87e3afab85fad176e9a5'
Sep 13, 2024
f81d7fc
Merged PR 42776: [internal/release/6.0.4xx] Update dependencies from …
Sep 13, 2024
e9225b0
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2024
9dad27a
Merged PR 42837: [internal/release/6.0.4xx] Update dependencies from …
Sep 13, 2024
6e54022
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 14, 2024
d127b03
Merged PR 42851: [internal/release/6.0.4xx] Update dependencies from …
Sep 16, 2024
4ad9f08
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 16, 2024
bb1f0dd
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 16, 2024
dc88fa4
Merged PR 42868: [internal/release/6.0.4xx] Merge from public
vseanreesermsft Sep 16, 2024
6129d29
Merged PR 42864: [internal/release/8.0.1xx] Update dependencies from …
Sep 16, 2024
a8f27c8
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 16, 2024
15e280c
Merge commit 'd47192a544ebc4e405d6f8b9e6c1bdbf692717d5'
Sep 17, 2024
b15da7b
Merged PR 42879: [internal/release/6.0.4xx] Update dependencies from …
Sep 17, 2024
a1f02d0
Merged PR 42944: [internal/release/8.0.1xx] Updated NuGet.config - ad…
vseanreesermsft Sep 17, 2024
6d9dfff
Merged PR 42943: [internal/release/6.0.4xx] Update dependencies from …
Sep 17, 2024
4ce784d
Merged PR 42967: Use the august release of the web templates
marcpopMSFT Sep 17, 2024
1747095
Merged PR 42956: [internal/release/8.0.1xx] Update dependencies from …
Sep 17, 2024
8f0c6f1
Merged PR 43016: [internal/release/8.0.1xx] Update dependencies from …
Sep 18, 2024
93fddcf
Merged PR 43030: [internal/release/6.0.4xx] Update dependencies from …
Sep 19, 2024
fe5161d
Merged PR 43040: [internal/release/8.0.1xx] Update dependencies from …
Sep 19, 2024
e95e057
Merged PR 43043: [internal/release/8.0.1xx] Updated SourceBuildPrebui…
vseanreesermsft Sep 20, 2024
87a66bb
Merged PR 43122: flow emsdk directly
marcpopMSFT Sep 24, 2024
58106ef
Merge commit '93fddcf4f606055cb6ff9753b8971e5f57a5d31d' into internal…
vseanreesermsft Oct 8, 2024
92766a5
Merge commit '87a66bb3d1cd008e190519ec85fd3c14c8c7f667' into internal…
vseanreesermsft Oct 8, 2024
70a13cd
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 10, 2024
aeb4f23
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 10, 2024
fdfe4f6
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Oct 10, 2024
fce7cd6
Merge branch 'release/8.0.1xx' into internal-merge-8.0.1xx-2024-10-08…
marcpopMSFT Oct 10, 2024
7893f8b
Merging internal commits for release/6.0.4xx (#20167)
mmitche Oct 10, 2024
d7b9c48
[release/8.0.1xx] Update dependencies from dotnet/source-build-extern…
v-wuzhai Oct 11, 2024
dd54f04
[release/6.0.4xx] Update dependencies from dotnet/arcade (#20181)
v-wuzhai Oct 11, 2024
dcd137d
[release/8.0.1xx] Update dependencies from dotnet/arcade (#20177)
v-wuzhai Oct 11, 2024
5691111
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/installer…
v-wuzhai Oct 11, 2024
8796214
[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' (#20184)
v-wuzhai Oct 11, 2024
38292a9
Merging internal commits for release/8.0.1xx (#20168)
marcpopMSFT Oct 11, 2024
26b7277
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/installer…
v-wuzhai Oct 12, 2024
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
1 change: 0 additions & 1 deletion ...ntent/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ index ------------
-./sdk/x.y.z/Containers/tasks/net472/Microsoft.Extensions.Options.dll
-./sdk/x.y.z/Containers/tasks/net472/Microsoft.Extensions.Primitives.dll
-./sdk/x.y.z/Containers/tasks/net472/Microsoft.IO.Redist.dll
-./sdk/x.y.z/Containers/tasks/net472/Microsoft.NET.Build.Containers.deps.json
-./sdk/x.y.z/Containers/tasks/net472/Microsoft.NET.Build.Containers.dll
-./sdk/x.y.z/Containers/tasks/net472/Microsoft.NET.Build.Containers.dll.config
-./sdk/x.y.z/Containers/tasks/net472/Microsoft.NET.StringTools.dll
Expand Down