Skip to content

Commit 3d837d6

Browse files
v-wuzhaiv-wuzhai
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 078f98e + 83f0e0b commit 3d837d6

File tree

454 files changed

+12808
-3718
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

+12808
-3718
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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@
4040
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
4141
<PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
4242
<PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistPackageVersion)" />
43+
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
4344
<PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
4445
<PackageVersion Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" />
46+
<PackageVersion Include="Microsoft.NET.StringTools" Version="$(MicrosoftNETStringToolsPackageVersion)" />
4547
<PackageVersion Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
4648
<PackageVersion Include="Microsoft.NETCore.Targets" Version="2.1.0" />
4749
<PackageVersion Include="Microsoft.TemplateEngine.Authoring.TemplateVerifier" Version="$(MicrosoftTemplateEngineAuthoringTemplateVerifierVersion)" />
@@ -55,8 +57,8 @@
5557
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
5658
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
5759
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
58-
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
5960
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32PackageVersion)" />
61+
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
6062
<PackageVersion Include="Moq" Version="$(MoqPackageVersion)" />
6163
<PackageVersion Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" />
6264
<PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />

‎NuGet.config

Lines changed: 12 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<configuration>
23
<packageSources>
34
<clear />
45
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
56
<!-- Begin: Package sources from dotnet-emsdk -->
6-
<add key="darc-pub-dotnet-emsdk-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
7-
<add key="darc-pub-dotnet-emsdk-c458a76-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-3/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-emsdk-c458a76-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-2/nuget/v3/index.json" />
9-
<add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
107
<!-- End: Package sources from dotnet-emsdk -->
118
<!-- Begin: Package sources from dotnet-format -->
12-
<add key="darc-pub-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-27f18656/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-format-27f1865-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-9/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-format-27f1865-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-6/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-format-27f1865-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-5/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-format-27f1865-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-4/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-format-27f1865-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-3/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-format-27f1865-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-2/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-format-27f1865-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-10/nuget/v3/index.json" />
21-
<add key="darc-int-dotnet-format-27f1865-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-1/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-format-42ef1d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-format-42ef1d0-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04-2/nuget/v3/index.json" />
11+
<add key="darc-pub-dotnet-format-42ef1d0-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04-1/nuget/v3/index.json" />
2212
<!-- End: Package sources from dotnet-format -->
2313
<!-- Begin: Package sources from dotnet-aspnetcore -->
24-
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca/nuget/v3/index.json" />
25-
<add key="darc-int-dotnet-aspnetcore-009e1cc-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-8/nuget/v3/index.json" />
26-
<add key="darc-int-dotnet-aspnetcore-009e1cc-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-7/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-aspnetcore-009e1cc-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-6/nuget/v3/index.json" />
28-
<add key="darc-int-dotnet-aspnetcore-009e1cc-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-5/nuget/v3/index.json" />
29-
<add key="darc-int-dotnet-aspnetcore-009e1cc-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-4/nuget/v3/index.json" />
30-
<add key="darc-int-dotnet-aspnetcore-009e1cc-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-3/nuget/v3/index.json" />
31-
<add key="darc-int-dotnet-aspnetcore-009e1cc-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-2/nuget/v3/index.json" />
32-
<add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-1/nuget/v3/index.json" />
3314
<!-- End: Package sources from dotnet-aspnetcore -->
3415
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
35-
<add key="darc-pub-DotNet-msbuild-Trusted-c3ade83" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-c3ade832/nuget/v3/index.json" />
16+
<add key="darc-pub-DotNet-msbuild-Trusted-0e18be8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-0e18be81/nuget/v3/index.json" />
3617
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3718
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3819
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3920
<!-- Begin: Package sources from dotnet-runtime -->
40-
<add key="darc-int-dotnet-runtime-eba546b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0/nuget/v3/index.json" />
41-
<add key="darc-int-dotnet-runtime-eba546b-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0-6/nuget/v3/index.json" />
4221
<!-- End: Package sources from dotnet-runtime -->
4322
<!-- Begin: Package sources from dotnet-templating -->
44-
<add key="darc-pub-dotnet-templating-a977119" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a977119e/nuget/v3/index.json" />
45-
<add key="darc-pub-dotnet-templating-a977119-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a977119e-1/nuget/v3/index.json" />
23+
<add key="darc-pub-dotnet-templating-488c525" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-488c525e/nuget/v3/index.json" />
4624
<!-- End: Package sources from dotnet-templating -->
4725
<!-- Begin: Package sources from dotnet-windowsdesktop -->
48-
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de/nuget/v3/index.json" />
49-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-8/nuget/v3/index.json" />
50-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-7/nuget/v3/index.json" />
51-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-6/nuget/v3/index.json" />
52-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-5/nuget/v3/index.json" />
53-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-4/nuget/v3/index.json" />
54-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-3/nuget/v3/index.json" />
55-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-2/nuget/v3/index.json" />
56-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-1/nuget/v3/index.json" />
5726
<!-- End: Package sources from dotnet-windowsdesktop -->
27+
<!-- Begin: Package sources from dotnet-winforms -->
28+
<!-- End: Package sources from dotnet-winforms -->
5829
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5930
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
6031
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
@@ -78,42 +49,16 @@
7849
<!-- Begin: Package sources from dotnet-templating -->
7950
<!-- End: Package sources from dotnet-templating -->
8051
<!-- Begin: Package sources from dotnet-aspnetcore -->
81-
<add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="true" />
82-
<add key="darc-int-dotnet-aspnetcore-009e1cc-2" value="true" />
83-
<add key="darc-int-dotnet-aspnetcore-009e1cc-3" value="true" />
84-
<add key="darc-int-dotnet-aspnetcore-009e1cc-4" value="true" />
85-
<add key="darc-int-dotnet-aspnetcore-009e1cc-5" value="true" />
86-
<add key="darc-int-dotnet-aspnetcore-009e1cc-6" value="true" />
87-
<add key="darc-int-dotnet-aspnetcore-009e1cc-7" value="true" />
88-
<add key="darc-int-dotnet-aspnetcore-009e1cc-8" value="true" />
89-
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="true" />
90-
<!-- End: Package sources from dotnet-aspnetcore -->
52+
<!-- Begin: Package sources from dotnet-emsdk -->
53+
<!-- End: Package sources from dotnet-emsdk -->
9154
<!-- Begin: Package sources from dotnet-format -->
92-
<add key="darc-int-dotnet-format-27f1865-1" value="true" />
93-
<add key="darc-int-dotnet-format-27f1865-10" value="true" />
94-
<add key="darc-int-dotnet-format-27f1865-2" value="true" />
95-
<add key="darc-int-dotnet-format-27f1865-3" value="true" />
96-
<add key="darc-int-dotnet-format-27f1865-4" value="true" />
97-
<add key="darc-int-dotnet-format-27f1865-5" value="true" />
98-
<add key="darc-int-dotnet-format-27f1865-6" value="true" />
99-
<add key="darc-int-dotnet-format-27f1865-9" value="true" />
100-
<add key="darc-int-dotnet-format-27f1865" value="true" />
10155
<!-- End: Package sources from dotnet-format -->
10256
<!-- End: Package sources from dotnet-aspnetcore -->
10357
<!-- Begin: Package sources from dotnet-runtime -->
104-
<add key="darc-int-dotnet-runtime-eba546b-6" value="true" />
105-
<add key="darc-int-dotnet-runtime-eba546b" value="true" />
10658
<!-- End: Package sources from dotnet-runtime -->
10759
<!-- Begin: Package sources from dotnet-windowsdesktop -->
108-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-1" value="true" />
109-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-2" value="true" />
110-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-3" value="true" />
111-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-4" value="true" />
112-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-5" value="true" />
113-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-6" value="true" />
114-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-7" value="true" />
115-
<add key="darc-int-dotnet-windowsdesktop-e43b37d-8" value="true" />
116-
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="true" />
60+
<!-- Begin: Package sources from dotnet-winforms -->
61+
<!-- End: Package sources from dotnet-winforms -->
11762
<!-- End: Package sources from dotnet-windowsdesktop -->
11863
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
11964
</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: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,19 @@
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="System.Reflection.Metadata/*8.0.0*" />
47+
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
48+
<UsagePattern IdentityGlob="Valleysoft.DockerCredsProvider/*" />
3549
</IgnorePatterns>
3650
</UsageData>

0 commit comments

Comments
 (0)