Skip to content

Commit 1f1de6b

Browse files
MiYanniMiYanni
authored
Merge branch 'release/8.0.3xx' into merge/release/8.0.1xx-to-release/8.0.3xx
2 parents 39c9762 + 1f3b8ce commit 1f1de6b

File tree

456 files changed

+12820
-3688
lines changed

Some content is hidden

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

456 files changed

+12820
-3688
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 & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,33 @@
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 -->
67
<add key="darc-pub-dotnet-emsdk-2b0cca8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a/nuget/v3/index.json" />
7-
<add key="darc-pub-dotnet-emsdk-2b0cca8-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a-3/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-emsdk-2b0cca8-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a-2/nuget/v3/index.json" />
9-
<add key="darc-pub-dotnet-emsdk-2b0cca8-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a-1/nuget/v3/index.json" />
108
<!-- End: Package sources from dotnet-emsdk -->
119
<!-- Begin: Package sources from dotnet-format -->
12-
<add key="darc-pub-dotnet-format-a9a546e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-a9a546ec/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-format-c7e5d39" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b/nuget/v3/index.json" />
1311
<!-- End: Package sources from dotnet-format -->
1412
<!-- Begin: Package sources from dotnet-aspnetcore -->
1513
<add key="darc-int-dotnet-aspnetcore-fa4d80b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-aspnetcore-fa4d80b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7-3/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-aspnetcore-fa4d80b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7-2/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-aspnetcore-fa4d80b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7-1/nuget/v3/index.json" />
1914
<!-- End: Package sources from dotnet-aspnetcore -->
2015
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
21-
<add key="darc-pub-DotNet-msbuild-Trusted-af11d4f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-af11d4f2-2/nuget/v3/index.json" />
16+
<add key="darc-int-DotNet-msbuild-Trusted-27f9d42" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-27f9d42f/nuget/v3/index.json" />
2217
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2318
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2419
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2520
<!-- Begin: Package sources from dotnet-runtime -->
2621
<add key="darc-int-dotnet-runtime-77545d6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-runtime-77545d6-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-3/nuget/v3/index.json" />
28-
<add key="darc-int-dotnet-runtime-77545d6-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-2/nuget/v3/index.json" />
29-
<add key="darc-int-dotnet-runtime-77545d6-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-1/nuget/v3/index.json" />
3022
<!-- End: Package sources from dotnet-runtime -->
3123
<!-- Begin: Package sources from dotnet-templating -->
32-
<add key="darc-pub-dotnet-templating-2a22f25" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2a22f253/nuget/v3/index.json" />
24+
<add key="darc-pub-dotnet-templating-7994f94" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7994f94e/nuget/v3/index.json" />
3325
<!-- End: Package sources from dotnet-templating -->
3426
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3527
<add key="darc-int-dotnet-windowsdesktop-5ce68f2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5ce68f29/nuget/v3/index.json" />
36-
<add key="darc-int-dotnet-windowsdesktop-5ce68f2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5ce68f29-3/nuget/v3/index.json" />
37-
<add key="darc-int-dotnet-windowsdesktop-5ce68f2-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5ce68f29-2/nuget/v3/index.json" />
38-
<add key="darc-int-dotnet-windowsdesktop-5ce68f2-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5ce68f29-1/nuget/v3/index.json" />
3928
<!-- End: Package sources from dotnet-windowsdesktop -->
29+
<!-- Begin: Package sources from dotnet-winforms -->
30+
<!-- End: Package sources from dotnet-winforms -->
4031
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4132
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
4233
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
@@ -60,27 +51,26 @@
6051
<!-- Begin: Package sources from dotnet-templating -->
6152
<!-- End: Package sources from dotnet-templating -->
6253
<!-- Begin: Package sources from dotnet-aspnetcore -->
63-
<add key="darc-int-dotnet-aspnetcore-fa4d80b-1" value="true" />
64-
<add key="darc-int-dotnet-aspnetcore-fa4d80b-2" value="true" />
65-
<add key="darc-int-dotnet-aspnetcore-fa4d80b-3" value="true" />
6654
<add key="darc-int-dotnet-aspnetcore-fa4d80b" value="true" />
6755
<!-- End: Package sources from dotnet-aspnetcore -->
68-
<!-- Begin: Package sources from dotnet-format -->
6956
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
57+
<add key="darc-int-DotNet-msbuild-Trusted-27f9d42" value="true" />
7058
<!-- End: Package sources from DotNet-msbuild-Trusted -->
59+
<!-- Begin: Package sources from dotnet-emsdk -->
60+
<!-- End: Package sources from dotnet-emsdk -->
61+
<!-- Begin: Package sources from dotnet-format -->
62+
<add key="darc-int-dotnet-format-6512c54-1" value="true" />
63+
<add key="darc-int-dotnet-format-6512c54-2" value="true" />
64+
<add key="darc-int-dotnet-format-6512c54" value="true" />
7165
<!-- End: Package sources from dotnet-format -->
7266
<!-- End: Package sources from dotnet-aspnetcore -->
7367
<!-- Begin: Package sources from dotnet-runtime -->
74-
<add key="darc-int-dotnet-runtime-77545d6-1" value="true" />
75-
<add key="darc-int-dotnet-runtime-77545d6-2" value="true" />
76-
<add key="darc-int-dotnet-runtime-77545d6-3" value="true" />
7768
<add key="darc-int-dotnet-runtime-77545d6" value="true" />
7869
<!-- End: Package sources from dotnet-runtime -->
7970
<!-- Begin: Package sources from dotnet-windowsdesktop -->
80-
<add key="darc-int-dotnet-windowsdesktop-5ce68f2-1" value="true" />
81-
<add key="darc-int-dotnet-windowsdesktop-5ce68f2-2" value="true" />
82-
<add key="darc-int-dotnet-windowsdesktop-5ce68f2-3" value="true" />
8371
<add key="darc-int-dotnet-windowsdesktop-5ce68f2" value="true" />
72+
<!-- Begin: Package sources from dotnet-winforms -->
73+
<!-- End: Package sources from dotnet-winforms -->
8474
<!-- End: Package sources from dotnet-windowsdesktop -->
8575
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
8676
</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)