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.1xx' => 'release/8.0.3xx' #20239

Merged
merged 34 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
e8679c2
Merge commit '91e3447dd88bba4101fe31026b3990de43dd9cca'
Oct 2, 2024
b98c338
Merge commit 'cf1dff5253c296d301db38b14ba81ee176470b8c'
Oct 2, 2024
94fe08e
Merge commit '03165a22305c7a237359722fa14ba79ee97d15af'
Oct 7, 2024
aa20e84
Merge commit '8504b3d29266fb3cff311ac6424cb3c026973045'
Oct 7, 2024
1d90320
Merge commit '15b52a9e38930822c516a2708595776786ea7a4a'
Oct 8, 2024
d134a2f
Merge commit '44f555ceef2a2a33fc9488c243b6a05d1943aeb9'
Oct 8, 2024
fe514d2
Merge commit 'd7b9c48e644a874e72c0452f02e10a1b7f09c221'
Oct 11, 2024
31054ec
Merge commit 'dcd137d6c01be482b56232c353e3442ab28550bf'
Oct 11, 2024
9c0bc8c
Merge commit '87962146d90e746f624c9665bfad60cbc7f6bca4'
Oct 11, 2024
4fb2337
Merge commit '38292a97e64ce1ef95cc787b8a8c405545a112f6'
Oct 11, 2024
f795032
Merge commit '0bce25f6fddebd3b274fbf01559757c53e41560c'
Oct 14, 2024
d341b5b
Merge commit '9f61cf9dfa4e9a9077398f4bf156fd3f035d9456'
Oct 15, 2024
5d3f261
Merge commit '4f106c6fad591d80aef4a9a6c347cfda16b0c2bf'
Oct 15, 2024
cb30ebc
Merge commit '8ab09c8d3d8b33e8e8bddeebbc5786befe49c935'
Oct 16, 2024
abe671c
Merge commit 'ef92ab0faeccfd04bbfa618b0f741a34ad797b8e'
Oct 16, 2024
2eba25d
Merge commit '4b1779d5ed72dc7130d99ea08ce6eb6eeb84977c'
Oct 17, 2024
30ce1d0
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 17, 2024
9f628d3
Merged PR 43918: [internal/release/8.0.1xx] Update dependencies from …
Oct 17, 2024
14e137f
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
327fc18
Merge commit '3da8ff961261f83a35bbf2e101818151f0affbe0'
Oct 21, 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
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
590790f
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/installer…
v-wuzhai Nov 13, 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
6119725
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/installer…
v-wuzhai Nov 15, 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
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.10.4" />
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.10.4" />

<!-- 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
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"
}
}