Skip to content

Commit 3d2ca6b

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into merge/release/8.0.1xx-to-release/8.0.3xx
2 parents 97651d1 + 52c00d8 commit 3d2ca6b

File tree

454 files changed

+12842
-3635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

454 files changed

+12842
-3635
lines changed

‎.vsts-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ trigger:
33
branches:
44
include:
55
- main
6-
- release/8.0.1xx
6+
- release/8.0.3xx
77
- internal/release/*
88
- exp/*
99

‎.vsts-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ trigger:
33
branches:
44
include:
55
- main
6-
- release/8.0.1xx
6+
- release/8.0.3xx
77
- internal/release/*
88
- exp/*
99

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- VS for Mac may run on a lower version of .NET than the SDK is targeting, but needs to load the resolvers. So the resolvers and dependencies
1818
may target a lower version of .NET -->
19-
<ResolverTargetFramework>net7.0</ResolverTargetFramework>
19+
<ResolverTargetFramework>net8.0</ResolverTargetFramework>
2020
<!-- Source build does not need to worry about running on VS for Mac -->
2121
<ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>
2222

‎Directory.Packages.props

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@
3939
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
4040
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
4141
<PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
42+
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
4243
<PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
4344
<PackageVersion Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" />
45+
<PackageVersion Include="Microsoft.NET.StringTools" Version="$(MicrosoftNETStringToolsPackageVersion)" />
4446
<PackageVersion Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
4547
<PackageVersion Include="Microsoft.NETCore.Targets" Version="2.1.0" />
4648
<PackageVersion Include="Microsoft.TemplateEngine.Authoring.TemplateVerifier" Version="$(MicrosoftTemplateEngineAuthoringTemplateVerifierVersion)" />
@@ -54,8 +56,8 @@
5456
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
5557
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
5658
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
57-
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
5859
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32PackageVersion)" />
60+
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
5961
<PackageVersion Include="Moq" Version="$(MoqPackageVersion)" />
6062
<PackageVersion Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" />
6163
<PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
@@ -103,7 +105,7 @@
103105
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonPackageVersion)" />
104106
<PackageVersion Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
105107
<PackageVersion Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentPackageVersion)" />
106-
<PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.0" />
108+
<PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.1" />
107109
<PackageVersion Include="xunit" Version="$(XUnitVersion)" />
108110
<PackageVersion Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
109111
<PackageVersion Include="xunit.console" Version="$(XUnitVersion)"/>

‎NuGet.config

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,29 @@
66
<!-- Begin: Package sources from dotnet-emsdk -->
77
<!-- End: Package sources from dotnet-emsdk -->
88
<!-- Begin: Package sources from dotnet-format -->
9-
<add key="darc-pub-dotnet-format-551db7f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-551db7f1/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-format-d237e17" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-format-d237e17-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-6/nuget/v3/index.json" />
11+
<add key="darc-pub-dotnet-format-d237e17-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-5/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-format-d237e17-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-4/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-format-d237e17-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-3/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-format-d237e17-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-2/nuget/v3/index.json" />
15+
<add key="darc-pub-dotnet-format-d237e17-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-d237e172-1/nuget/v3/index.json" />
1016
<!-- End: Package sources from dotnet-format -->
1117
<!-- Begin: Package sources from dotnet-aspnetcore -->
1218
<!-- End: Package sources from dotnet-aspnetcore -->
1319
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
14-
<add key="darc-pub-DotNet-msbuild-Trusted-b5265ef" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-b5265ef3/nuget/v3/index.json" />
1520
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1621
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1722
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1823
<!-- Begin: Package sources from dotnet-runtime -->
1924
<!-- End: Package sources from dotnet-runtime -->
2025
<!-- Begin: Package sources from dotnet-templating -->
21-
<add key="darc-pub-dotnet-templating-5cab537" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5cab5378/nuget/v3/index.json" />
26+
<add key="darc-pub-dotnet-templating-350f329" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-350f3294/nuget/v3/index.json" />
2227
<!-- End: Package sources from dotnet-templating -->
2328
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2429
<!-- End: Package sources from dotnet-windowsdesktop -->
30+
<!-- Begin: Package sources from dotnet-winforms -->
31+
<!-- End: Package sources from dotnet-winforms -->
2532
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2633
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
2734
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
@@ -45,13 +52,14 @@
4552
<!-- Begin: Package sources from dotnet-templating -->
4653
<!-- End: Package sources from dotnet-templating -->
4754
<!-- Begin: Package sources from dotnet-aspnetcore -->
48-
<!-- End: Package sources from dotnet-aspnetcore -->
4955
<!-- Begin: Package sources from dotnet-format -->
5056
<!-- End: Package sources from dotnet-format -->
5157
<!-- End: Package sources from dotnet-aspnetcore -->
5258
<!-- Begin: Package sources from dotnet-runtime -->
5359
<!-- End: Package sources from dotnet-runtime -->
5460
<!-- Begin: Package sources from dotnet-windowsdesktop -->
61+
<!-- Begin: Package sources from dotnet-winforms -->
62+
<!-- End: Package sources from dotnet-winforms -->
5563
<!-- End: Package sources from dotnet-windowsdesktop -->
5664
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5765
</disabledPackageSources>

‎documentation/general/workloads/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ Other documentation for workloads is in this repo:
2020
- [Grouping multiple packs into one MSI](https://github.com/dotnet/sdk/issues/21741)
2121
- [Handling workload assets across major .NET versions](cross-version-workloads.md)
2222
- [Workload Clean Command](workload-clean.md)
23+
- [Workload MSI Installation Tests](/src/Tests/dotnet-MsiInstallation.Tests/README.md)

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,17 @@
3232
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
3333
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
3434
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
35+
36+
<!-- (Don't include these for 9.0) Allow 8.0.2xx and higher to use any version of these packages since source build
37+
is only applicable to 8.0.1xx. -->
38+
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Abstractions/8.0.*" />
39+
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core/8.0.*" />
40+
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core.Contracts/8.0.*" />
41+
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Edge/8.0.*" />
42+
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Orchestrator.RunnableProjects/8.0.*" />
43+
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Utils/8.0.*" />
44+
<UsagePattern IdentityGlob="Microsoft.TemplateSearch.Common/8.0.*" />
45+
<UsagePattern IdentityGlob="System.Drawing.Common/8.0.*" />
46+
<UsagePattern IdentityGlob="Valleysoft.DockerCredsProvider/*" />
3547
</IgnorePatterns>
3648
</UsageData>

0 commit comments

Comments
 (0)