Skip to content

Commit ed35954

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 6a88b80 + d20e125 commit ed35954

File tree

457 files changed

+12824
-3682
lines changed

Some content is hidden

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

457 files changed

+12824
-3682
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: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<configuration>
23
<packageSources>
34
<clear />
@@ -13,7 +14,12 @@
1314
<add key="darc-pub-dotnet-emsdk-adc0d6e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7-1/nuget/v3/index.json" />
1415
<!-- End: Package sources from dotnet-emsdk -->
1516
<!-- Begin: Package sources from dotnet-format -->
16-
<add key="darc-pub-dotnet-format-664013f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-664013fb/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-format-c61d046" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-format-c61d046-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a-7/nuget/v3/index.json" />
19+
<add key="darc-pub-dotnet-format-c61d046-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a-6/nuget/v3/index.json" />
20+
<add key="darc-pub-dotnet-format-c61d046-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a-5/nuget/v3/index.json" />
21+
<add key="darc-pub-dotnet-format-c61d046-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a-4/nuget/v3/index.json" />
22+
<add key="darc-pub-dotnet-format-c61d046-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a-3/nuget/v3/index.json" />
1723
<!-- End: Package sources from dotnet-format -->
1824
<!-- Begin: Package sources from dotnet-aspnetcore -->
1925
<add key="darc-int-dotnet-aspnetcore-4ae1269" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ae1269b/nuget/v3/index.json" />
@@ -23,12 +29,7 @@
2329
<add key="darc-int-dotnet-aspnetcore-4ae1269-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ae1269b-4/nuget/v3/index.json" />
2430
<!-- End: Package sources from dotnet-aspnetcore -->
2531
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
26-
<add key="darc-int-DotNet-msbuild-Trusted-3ab07f0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-3ab07f0c/nuget/v3/index.json" />
27-
<add key="darc-int-DotNet-msbuild-Trusted-3ab07f0-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-3ab07f0c-7/nuget/v3/index.json" />
28-
<add key="darc-int-DotNet-msbuild-Trusted-3ab07f0-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-3ab07f0c-6/nuget/v3/index.json" />
29-
<add key="darc-int-DotNet-msbuild-Trusted-3ab07f0-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-3ab07f0c-5/nuget/v3/index.json" />
30-
<add key="darc-int-DotNet-msbuild-Trusted-3ab07f0-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-3ab07f0c-4/nuget/v3/index.json" />
31-
<add key="darc-int-DotNet-msbuild-Trusted-3ab07f0-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-3ab07f0c-3/nuget/v3/index.json" />
32+
<add key="darc-pub-DotNet-msbuild-Trusted-323d4b3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-323d4b37/nuget/v3/index.json" />
3233
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3334
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3435
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -40,7 +41,7 @@
4041
<add key="darc-int-dotnet-runtime-efd5742-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b-4/nuget/v3/index.json" />
4142
<!-- End: Package sources from dotnet-runtime -->
4243
<!-- Begin: Package sources from dotnet-templating -->
43-
<add key="darc-pub-dotnet-templating-c7d33c9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c7d33c95/nuget/v3/index.json" />
44+
<add key="darc-pub-dotnet-templating-d8a5bd5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d8a5bd5b/nuget/v3/index.json" />
4445
<!-- End: Package sources from dotnet-templating -->
4546
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4647
<add key="darc-int-dotnet-windowsdesktop-cda1f82" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cda1f825/nuget/v3/index.json" />
@@ -49,6 +50,8 @@
4950
<add key="darc-int-dotnet-windowsdesktop-cda1f82-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cda1f825-5/nuget/v3/index.json" />
5051
<add key="darc-int-dotnet-windowsdesktop-cda1f82-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cda1f825-4/nuget/v3/index.json" />
5152
<!-- End: Package sources from dotnet-windowsdesktop -->
53+
<!-- Begin: Package sources from dotnet-winforms -->
54+
<!-- End: Package sources from dotnet-winforms -->
5255
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5356
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
5457
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
@@ -77,16 +80,9 @@
7780
<add key="darc-int-dotnet-aspnetcore-4ae1269-6" value="true" />
7881
<add key="darc-int-dotnet-aspnetcore-4ae1269-7" value="true" />
7982
<add key="darc-int-dotnet-aspnetcore-4ae1269" value="true" />
80-
<!-- End: Package sources from dotnet-aspnetcore -->
83+
<!-- Begin: Package sources from dotnet-emsdk -->
84+
<!-- End: Package sources from dotnet-emsdk -->
8185
<!-- Begin: Package sources from dotnet-format -->
82-
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
83-
<add key="darc-int-DotNet-msbuild-Trusted-3ab07f0-3" value="true" />
84-
<add key="darc-int-DotNet-msbuild-Trusted-3ab07f0-4" value="true" />
85-
<add key="darc-int-DotNet-msbuild-Trusted-3ab07f0-5" value="true" />
86-
<add key="darc-int-DotNet-msbuild-Trusted-3ab07f0-6" value="true" />
87-
<add key="darc-int-DotNet-msbuild-Trusted-3ab07f0-7" value="true" />
88-
<add key="darc-int-DotNet-msbuild-Trusted-3ab07f0" value="true" />
89-
<!-- End: Package sources from DotNet-msbuild-Trusted -->
9086
<!-- End: Package sources from dotnet-format -->
9187
<!-- End: Package sources from dotnet-aspnetcore -->
9288
<!-- Begin: Package sources from dotnet-runtime -->
@@ -102,6 +98,8 @@
10298
<add key="darc-int-dotnet-windowsdesktop-cda1f82-6" value="true" />
10399
<add key="darc-int-dotnet-windowsdesktop-cda1f82-7" value="true" />
104100
<add key="darc-int-dotnet-windowsdesktop-cda1f82" value="true" />
101+
<!-- Begin: Package sources from dotnet-winforms -->
102+
<!-- End: Package sources from dotnet-winforms -->
105103
<!-- End: Package sources from dotnet-windowsdesktop -->
106104
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
107105
</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)