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

[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' #20250

Merged
merged 78 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
e8679c2
Merge commit '91e3447dd88bba4101fe31026b3990de43dd9cca'
Oct 2, 2024
382655f
Merge commit '8e972094df8740676b54b11a37d746157f017b37'
Oct 2, 2024
b98c338
Merge commit 'cf1dff5253c296d301db38b14ba81ee176470b8c'
Oct 2, 2024
c1cff63
Merge commit '88653b401d2cbf2137edaf545d25fca4739fa72d'
Oct 2, 2024
cce2520
Merge commit 'e6574cc0ce43f85cc5dd0c98502af6343e7a7ab2'
Oct 3, 2024
e856f7e
Merge commit 'ffd387eba6c335946f9a164e6b60d2b7d5e475ec'
Oct 4, 2024
4f91a2f
Merge commit '35767d8564d14d7552ef571d3749e719c5464589'
Oct 7, 2024
94fe08e
Merge commit '03165a22305c7a237359722fa14ba79ee97d15af'
Oct 7, 2024
aa20e84
Merge commit '8504b3d29266fb3cff311ac6424cb3c026973045'
Oct 7, 2024
f9f3893
Merge commit '6d1bb6a7da22b5a96dbcbcd33258a4923badbb06'
Oct 7, 2024
1d90320
Merge commit '15b52a9e38930822c516a2708595776786ea7a4a'
Oct 8, 2024
40db3a7
Merge commit '7fa79356055b6bac774a8a866b81b57e6f8ff116'
Oct 8, 2024
d134a2f
Merge commit '44f555ceef2a2a33fc9488c243b6a05d1943aeb9'
Oct 8, 2024
d560737
Merge commit 'e355551c549ddd01b2acf6797dcc0033480cfc8e'
Oct 8, 2024
0ae722f
Merge commit '157d0eb78931b751a098ab93a5fee1e69ef3ee7b'
Oct 9, 2024
b650e42
Merge commit '7893f8bff47b1f93271d9456ea95396be7e906d6'
Oct 10, 2024
fe514d2
Merge commit 'd7b9c48e644a874e72c0452f02e10a1b7f09c221'
Oct 11, 2024
7180d61
Merge commit 'dd54f04aa76ef1977e218f28c5095d6769be0369'
Oct 11, 2024
31054ec
Merge commit 'dcd137d6c01be482b56232c353e3442ab28550bf'
Oct 11, 2024
7f21cf9
Merge commit '57d80cfc668d1566a9b519015cf15b73783fb1c9'
Oct 11, 2024
9c0bc8c
Merge commit '87962146d90e746f624c9665bfad60cbc7f6bca4'
Oct 11, 2024
4fb2337
Merge commit '38292a97e64ce1ef95cc787b8a8c405545a112f6'
Oct 11, 2024
56a718f
Merge commit 'dbb7be8307dd273bd314135b7b30bc7f23b86a03'
Oct 12, 2024
f795032
Merge commit '0bce25f6fddebd3b274fbf01559757c53e41560c'
Oct 14, 2024
514e984
Merge commit '1872605103fc573c4974d27aae5a875fc3cb9987'
Oct 14, 2024
7b54bf6
Merge commit '2158e43c088b4f9e05c374a5132d27901759bb20'
Oct 14, 2024
8a13f70
Merge commit 'd6c542e8139f276af22e42ca71e9200660800417'
Oct 15, 2024
8b09158
Merge commit '9e7b80201e26eb5fe9c064ff66ea017e579f238c'
Oct 15, 2024
d341b5b
Merge commit '9f61cf9dfa4e9a9077398f4bf156fd3f035d9456'
Oct 15, 2024
5d3f261
Merge commit '4f106c6fad591d80aef4a9a6c347cfda16b0c2bf'
Oct 15, 2024
cb30ebc
Merge commit '8ab09c8d3d8b33e8e8bddeebbc5786befe49c935'
Oct 16, 2024
96eddee
Merge commit '1cf15dab26b4b97c69c161a2b95db502abfe679c'
Oct 16, 2024
abe671c
Merge commit 'ef92ab0faeccfd04bbfa618b0f741a34ad797b8e'
Oct 16, 2024
8bebca9
Merge commit '5b12bb243859e9e90e52d36840962e3c225880bb'
Oct 16, 2024
2eba25d
Merge commit '4b1779d5ed72dc7130d99ea08ce6eb6eeb84977c'
Oct 17, 2024
4fa678a
Merge commit 'bb536f6dd74781aeb3b132d776123743ed1b3e05'
Oct 17, 2024
30ce1d0
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 17, 2024
93e4a60
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 17, 2024
5ab18ab
Merged PR 43921: [internal/release/8.0.3xx] Update dependencies from …
Oct 17, 2024
9f628d3
Merged PR 43918: [internal/release/8.0.1xx] Update dependencies from …
Oct 17, 2024
830f9ea
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 17, 2024
6d07e57
Merged PR 43928: [internal/release/6.0.4xx] Update dependencies from …
Oct 18, 2024
14e137f
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 21, 2024
01a2250
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 21, 2024
748a21c
Merged PR 44061: [internal/release/8.0.1xx] Update dependencies from …
Oct 21, 2024
a457fcf
Merged PR 44063: [internal/release/8.0.3xx] Update dependencies from …
Oct 21, 2024
327fc18
Merge commit '3da8ff961261f83a35bbf2e101818151f0affbe0'
Oct 21, 2024
c93651e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 22, 2024
3829d74
Merged PR 44080: [internal/release/8.0.3xx] Update dependencies from …
Oct 22, 2024
fc64231
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 22, 2024
fe6a861
Merged PR 44135: [internal/release/8.0.1xx] Update dependencies from …
Oct 22, 2024
5484e02
Update emsdk to 8.0.11
NikolaMilosavljevic Oct 23, 2024
59c86e4
Update NuGet.config
NikolaMilosavljevic Oct 23, 2024
86610a1
Add back the coherent dependency
NikolaMilosavljevic Oct 23, 2024
ad116b5
Merged PR 44200: Update emsdk to 8.0.11
NikolaMilosavljevic Oct 23, 2024
353be46
Merged PR 44215: Add back the coherency dependency and resync runtime…
marcpopMSFT Oct 23, 2024
ef6f5ce
Merged PR 44319: Update to the 6.0.36 emsdk build
marcpopMSFT Oct 24, 2024
5640b45
Update Windows SDK projection
manodasanW Nov 12, 2024
11849af
Merge commit '353be46607a6b166218c60c5127c7437bc0e5362' into internal…
vseanreesermsft Nov 12, 2024
ed1d89b
Merge commit 'ad116b5ce0e1a222beb09d9301660441db38727b' into internal…
vseanreesermsft Nov 12, 2024
0545ddd
.NET Source-Build 8.0.111 November 2024 Updates (#20232)
dotnet-sb-bot Nov 12, 2024
a8669c1
Merging internal commits for release/8.0.1xx (#20235)
marcpopMSFT Nov 12, 2024
bcd05d3
Merging internal commits for release/6.0.4xx (#20236)
marcpopMSFT Nov 12, 2024
c5f9bc2
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/installer…
v-wuzhai Nov 13, 2024
590790f
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/installer…
v-wuzhai Nov 13, 2024
fc44a25
[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' (#20241)
v-wuzhai Nov 13, 2024
ed2d7a9
[release/8.0.1xx] Update dependencies from dotnet/arcade (#20243)
dotnet-maestro[bot] Nov 14, 2024
209174e
Add prebuilt exclusions for emsdk packages
NikolaMilosavljevic Nov 14, 2024
fe90c0e
Merge branch 'release/8.0.3xx' into merge/release/8.0.1xx-to-release/…
NikolaMilosavljevic Nov 14, 2024
84b47b8
Merge branch 'release/8.0.3xx' into internal-merge-8.0.3xx-2024-11-12…
marcpopMSFT Nov 14, 2024
344a4fd
[release/8.0.1xx] Update Windows SDK projection (#20231)
marcpopMSFT Nov 14, 2024
5e6d6bb
Merging internal commits for release/8.0.3xx (#20233)
v-wuzhai Nov 15, 2024
6119725
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/installer…
v-wuzhai Nov 15, 2024
4d52c9f
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#20239)
v-wuzhai Nov 15, 2024
f69c6db
Update SB dev container image (#20247)
mthalman Nov 15, 2024
b3bc830
Merge branch 'release/8.0.3xx' into merge/release/8.0.1xx-to-release/…
marcpopMSFT Nov 19, 2024
0c79f17
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#20248)
v-wuzhai Nov 21, 2024
9e82fa2
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/installer…
v-wuzhai Nov 21, 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
14 changes: 11 additions & 3 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-f623714" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f6237140/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-d3e7d29" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d3e7d292/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
Expand All @@ -19,7 +23,11 @@
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-07eb260" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-07eb260e/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-07eb260-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-07eb260e-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!--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 @@ -41,11 +49,11 @@
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-07eb260-1" value="true" />
<add key="darc-int-dotnet-sdk-07eb260" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- Begin: Package sources from dotnet-sdk -->
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-d3e7d29" 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
5 changes: 5 additions & 0 deletions eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
<UsagePattern IdentityGlob="Microsoft.Build*/17.11.*" />
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.11.*" />

<!-- These emsdk packages are allowed for installer repo build. The live version will be flowed in for the VMR build. -->
<UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100/8.0.*" />
<UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100/8.0.*" />
<UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100/8.0.*" />

<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />

Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Container contains checked-out source code only
{
"name": "Default",
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36",
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41",
"hostRequirements": {
// A completely source built .NET is >64 GB with all the repos/artifacts
"storage": "128gb"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Container contains a pre-built SDK
{
"name": "Pre-built .NET SDK",
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36",
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41",
"hostRequirements": {
// A completely source built .NET is >64 GB with all the repos/artifacts
"storage": "128gb"
Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/content/eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
These URLs can't be composed from their base URL and version as we read them from the
prep.sh and pipeline scripts, outside of MSBuild.
-->
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.110-servicing.24474.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
<PrivateSourceBuiltSdkUrl>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.110-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.111-servicing.24523.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
<PrivateSourceBuiltSdkUrl>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.111-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions src/SourceBuild/content/global.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"tools": {
"dotnet": "8.0.110"
"dotnet": "8.0.111"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",
"Microsoft.Build.Traversal": "2.0.2",
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24463.3",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
"Yarn.MSBuild": "1.15.2"
}
}