Skip to content

Commit 191c4a4

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 36e90b7 + 6fd9501 commit 191c4a4

File tree

454 files changed

+12804
-3634
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

+12804
-3634
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
@@ -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)" />
@@ -106,7 +108,7 @@
106108
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonPackageVersion)" />
107109
<PackageVersion Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
108110
<PackageVersion Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentPackageVersion)" />
109-
<PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.0" />
111+
<PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.1" />
110112
<PackageVersion Include="xunit" Version="$(XUnitVersion)" />
111113
<PackageVersion Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
112114
<PackageVersion Include="xunit.console" Version="$(XUnitVersion)"/>

‎NuGet.config

Lines changed: 10 additions & 5 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 />
@@ -6,13 +7,12 @@
67
<add key="darc-pub-dotnet-emsdk-d667257" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-emsdk -->
89
<!-- Begin: Package sources from dotnet-format -->
9-
<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" />
10+
<add key="darc-int-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d/nuget/v3/index.json" />
1011
<!-- End: Package sources from dotnet-format -->
1112
<!-- Begin: Package sources from dotnet-aspnetcore -->
1213
<add key="darc-int-dotnet-aspnetcore-c2a4429" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298/nuget/v3/index.json" />
1314
<!-- End: Package sources from dotnet-aspnetcore -->
1415
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
15-
<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" />
1616
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1717
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1818
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -30,11 +30,13 @@
3030
<add key="darc-int-dotnet-runtime-2aade6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-1/nuget/v3/index.json" />
3131
<!-- End: Package sources from dotnet-runtime -->
3232
<!-- Begin: Package sources from dotnet-templating -->
33-
<add key="darc-pub-dotnet-templating-3a8381b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-3a8381be/nuget/v3/index.json" />
33+
<add key="darc-pub-dotnet-templating-e211ed4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e211ed40/nuget/v3/index.json" />
3434
<!-- End: Package sources from dotnet-templating -->
3535
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3636
<add key="darc-int-dotnet-windowsdesktop-f655eec" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd/nuget/v3/index.json" />
3737
<!-- End: Package sources from dotnet-windowsdesktop -->
38+
<!-- Begin: Package sources from dotnet-winforms -->
39+
<!-- End: Package sources from dotnet-winforms -->
3840
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3941
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
4042
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
@@ -59,9 +61,10 @@
5961
<!-- End: Package sources from dotnet-templating -->
6062
<!-- Begin: Package sources from dotnet-aspnetcore -->
6163
<add key="darc-int-dotnet-aspnetcore-c2a4429" value="true" />
62-
<!-- End: Package sources from dotnet-aspnetcore -->
64+
<!-- Begin: Package sources from dotnet-emsdk -->
65+
<!-- End: Package sources from dotnet-emsdk -->
6366
<!-- Begin: Package sources from dotnet-format -->
64-
<add key="darc-int-dotnet-format-27f1865" value="true" />
67+
<add key="darc-int-dotnet-format-86f5186" value="true" />
6568
<!-- End: Package sources from dotnet-format -->
6669
<!-- End: Package sources from dotnet-aspnetcore -->
6770
<!-- Begin: Package sources from dotnet-runtime -->
@@ -79,6 +82,8 @@
7982
<!-- End: Package sources from dotnet-runtime -->
8083
<!-- Begin: Package sources from dotnet-windowsdesktop -->
8184
<add key="darc-int-dotnet-windowsdesktop-f655eec" value="true" />
85+
<!-- Begin: Package sources from dotnet-winforms -->
86+
<!-- End: Package sources from dotnet-winforms -->
8287
<!-- End: Package sources from dotnet-windowsdesktop -->
8388
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
8489
</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)