Skip to content

Commit

Permalink
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#19990)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcpopMSFT authored Jul 12, 2024
2 parents 883d770 + 979209d commit 75d88db
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 61 deletions.
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.106-servicing.24278.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
<PrivateSourceBuiltSdkUrl>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.106-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.107-servicing.24317.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
<PrivateSourceBuiltSdkUrl>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.107-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/SourceBuild/content/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "8.0.106"
"dotnet": "8.0.107"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,25 +63,11 @@ msft,./sdk/x.y.z/**/System.Windows.Extensions.dll
msft,./sdk/x.y.z/**/System.Security.Permissions.dll
msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Diagnostics.EventLog.dll

# netfx runtimes for dotnet-watch - https://github.com/dotnet/source-build/issues/3285
msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Elfie.dll
msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Win32.SystemEvents.dll
msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/*
msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Configuration.ConfigurationManager.dll
msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Drawing.Common.dll
msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll
msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll
msft,./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll

# netfx runtimes for dotnet-format - https://github.com/dotnet/source-build/issues/3509
msft,./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.Elfie.dll
msft,./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.Win32.SystemEvents.dll
msft,./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/*
msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Configuration.ConfigurationManager.dll
msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Drawing.Common.dll
msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Cryptography.ProtectedData.dll
msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Permissions.dll
msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Windows.Extensions.dll
# Exclude format and watch tools due to too much noise
msft,./sdk/x.y.z/DotnetTools/dotnet-format/**
msft,./sdk/x.y.z/DotnetTools/dotnet-watch/**
sb,./sdk/x.y.z/DotnetTools/dotnet-format/**
sb,./sdk/x.y.z/DotnetTools/dotnet-watch/**

# netfx runtimes for fsharp - https://github.com/dotnet/source-build/issues/3290
msft,./sdk/x.y.z/FSharp/Microsoft.VisualStudio.Setup.Configuration.Interop.dll
Expand All @@ -96,4 +82,4 @@ msft,./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll
# runtime components in roslyn layout - https://github.com/dotnet/source-build/issues/3286
# Expected - build is filtering components present in target platform.
msft,./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll
msft,./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll
msft,./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll

This file was deleted.

0 comments on commit 75d88db

Please sign in to comment.