Skip to content

Commit 0b24e09

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Backflow from https://github.com/dotnet/dotnet / a0ca1b9 build 284548
[[ commit created by automation ]]
1 parent dfa14d7 commit 0b24e09

File tree

15 files changed

+336
-280
lines changed

15 files changed

+336
-280
lines changed

‎eng/Versions.props‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl>
5454
</PropertyGroup>
5555
<PropertyGroup Label="Production dependencies">
56-
<MicrosoftWebXdtPackageVersion>3.2.0-preview.25377.103</MicrosoftWebXdtPackageVersion>
5756
<MicrosoftCssParserVersion>1.0.0-20230414.1</MicrosoftCssParserVersion>
5857
<MicrosoftApplicationInsightsPackageVersion>2.23.0</MicrosoftApplicationInsightsPackageVersion>
5958
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
@@ -62,7 +61,6 @@
6261
<SystemDataSqlClientPackageVersion>4.8.6</SystemDataSqlClientPackageVersion>
6362
<StyleCopAnalyzersPackageVersion>1.2.0-beta.435</StyleCopAnalyzersPackageVersion>
6463
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
65-
<SystemCommandLineVersion>2.0.0-rc.1.25377.103</SystemCommandLineVersion>
6664
<SystemCommandLineNamingConventionBinderVersion>2.0.0-beta5.25279.2</SystemCommandLineNamingConventionBinderVersion>
6765
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2</MicrosoftCodeAnalysisAnalyzerTestingVersion>
6866
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
@@ -79,7 +77,6 @@
7977
<AspirePackageVersion>9.4.0</AspirePackageVersion>
8078
</PropertyGroup>
8179
<PropertyGroup>
82-
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
8380
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
8481
Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
8582
<MicrosoftBclAsyncInterfacesToolsetPackageVersion>9.0.0</MicrosoftBclAsyncInterfacesToolsetPackageVersion>
@@ -140,7 +137,6 @@
140137
<AwesomeAssertionsVersion>8.0.2</AwesomeAssertionsVersion>
141138
<AwesomeAssertionsJsonVersion>8.0.0</AwesomeAssertionsJsonVersion>
142139
<MoqPackageVersion>4.18.4</MoqPackageVersion>
143-
<MSTestVersion>3.11.0-preview.25381.6</MSTestVersion>
144140
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
145141
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
146142
<BenchmarkDotNetPackageVersion>0.14.0</BenchmarkDotNetPackageVersion>

‎es-metadata.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
schemaVersion: 0.0.1
2+
isProduction: true
3+
accountableOwners:
4+
service: 30f635d8-2918-48af-8ddf-d9bc854b7584
5+
routing:
6+
defaultAreaPath:
7+
org: devdiv
8+
path: DevDiv\NET Tools\SDK

‎src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
</ItemGroup>
2323

2424
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
25-
<!-- Reference 6.0.0 targeting packs in Source Build -->
26-
<FrameworkReference Update="Microsoft.AspNetCore.App" TargetingPackVersion="6.0.0" />
25+
<!-- Reference 6.0 targeting packs in Source Build -->
26+
<FrameworkReference Update="Microsoft.AspNetCore.App" TargetingPackVersion="6.0.2" />
2727
<FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="6.0.0" />
2828
</ItemGroup>
2929

‎src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,7 @@ private static Command ConstructCommand()
174174

175175
private class ShowWorkloadsInfoAction : SynchronousCommandLineAction
176176
{
177-
public ShowWorkloadsInfoAction()
178-
{
179-
Terminating = true;
180-
}
177+
public override bool Terminating => true;
181178

182179
public override int Invoke(ParseResult parseResult)
183180
{
@@ -189,10 +186,7 @@ public override int Invoke(ParseResult parseResult)
189186

190187
private class ShowWorkloadsVersionOption : SynchronousCommandLineAction
191188
{
192-
public ShowWorkloadsVersionOption()
193-
{
194-
Terminating = true;
195-
}
189+
public override bool Terminating => true;
196190

197191
public override int Invoke(ParseResult parseResult)
198192
{

‎src/Cli/dotnet/Parser.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,10 +427,8 @@ public override void Write(HelpContext context)
427427

428428
private class PrintCliSchemaAction : SynchronousCommandLineAction
429429
{
430-
internal PrintCliSchemaAction()
431-
{
432-
Terminating = true;
433-
}
430+
public override bool Terminating => true;
431+
434432
public override int Invoke(ParseResult parseResult)
435433
{
436434
CliSchema.PrintCliSchema(parseResult.CommandResult, parseResult.InvocationConfiguration.Output, Program.TelemetryClient);

‎src/Layout/pkg/dotnet-sdk.proj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
99
<BuildDebPackage Condition="'$(BuildSdkDeb)' == 'true'">true</BuildDebPackage>
1010
<BuildRpmPackage Condition="'$(BuildSdkRpm)' == 'true'">true</BuildRpmPackage>
11-
<UseArcadeRpmTooling>true</UseArcadeRpmTooling>
1211
<ProductBrandPrefix>Microsoft .NET</ProductBrandPrefix>
1312
<LicenseFile>$(RepoRoot)LICENSE.TXT</LicenseFile>
1413
<InstallerName>dotnet-sdk</InstallerName>
@@ -119,7 +118,7 @@
119118
</Target>
120119

121120
<Target Name="AddLinuxPackageInformation"
122-
BeforeTargets="GetDebInstallerJsonProperties;GetRpmInstallerJsonProperties"
121+
BeforeTargets="GetAdditionalLinuxInstallerProperties"
123122
DependsOnTargets="CalculateLinuxNativeInstallerDependencyVersions">
124123

125124
<PropertyGroup>

‎src/Layout/redist/redist.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageReference Include="Microsoft.Build.NuGetSdkResolver" />
3030
<PackageReference Include="Microsoft.TestPlatform.CLI" ExcludeAssets="All" />
3131
<PackageReference Include="Microsoft.TestPlatform.Build" />
32-
<PackageReference Condition=" '$(DotNetBuildSourceOnly)' != 'true' " Include="NuGet.Localization" />
32+
<PackageReference Include="NuGet.Localization" />
3333
<PackageReference Include="NuGet.ProjectModel" />
3434
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" ExcludeAssets="All" GeneratePathProperty="true" />
3535
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" ExcludeAssets="All" GeneratePathProperty="true" />

‎src/Layout/redist/targets/BundledSdks.targets‎

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

33
<ItemGroup>
44
<BundledSdk Include="NuGet.Build.Tasks.Pack" Version="$(NuGetBuildTasksPackPackageVersion)" />
5-
<BundledSdk Include="Microsoft.NET.Sdk.WindowsDesktop" Version="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
5+
<BundledSdk Include="Microsoft.NET.Sdk.WindowsDesktop" Version="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" />
66
<BundledSdk Include="FSharp.NET.Sdk" Version="1.0.4-bundled-0100" />
77
<BundledSdk Include="Microsoft.Docker.Sdk" Version="1.1.0" />
88

‎src/Layout/redist/targets/BundledTemplates.targets‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<ItemGroup Label=".NET 10.0 templates">
44
<Bundled100Templates Include="Microsoft.DotNet.Web.ItemTemplates.10.0" PackageVersion="$(MicrosoftDotNetWebItemTemplates100PackageVersion)" />
55
<Bundled100Templates Include="Microsoft.DotNet.Web.ProjectTemplates.10.0" PackageVersion="$(MicrosoftDotNetWebProjectTemplates100PackageVersion)" UseVersionForTemplateInstallPath="true" />
6-
<Bundled100Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
7-
<Bundled100Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
6+
<Bundled100Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" />
7+
<Bundled100Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" />
88
</ItemGroup>
99

1010
<ItemGroup>
@@ -56,11 +56,6 @@
5656
</Target>
5757

5858
<Target Name="LayoutTemplatesForSDK" DependsOnTargets="CalculateTemplatesVersions;GetRepoTemplates">
59-
<ItemGroup Condition="!$(ProductMonikerRid.StartsWith('win'))">
60-
<BundledTemplatesWithInstallPaths Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" />
61-
<BundledTemplatesWithInstallPaths Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
62-
</ItemGroup>
63-
6459
<Copy SourceFiles="%(BundledTemplatesWithInstallPaths.RestoredNupkgPath)"
6560
DestinationFolder="$(RedistInstallerLayoutPath)templates\%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)"
6661
Condition="'%(BundledTemplatesWithInstallPaths.TemplateFrameworkVersion)' == '10.0'" />

‎src/Layout/redist/targets/GenerateBundledVersions.targets‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -276,14 +276,6 @@
276276
Condition="'$(BundleRuntimePacks)' == 'true'"
277277
Include="$(ProductMonikerRid)" />
278278

279-
<ILCompilerSupportedRids
280-
Condition="'$(BundleNativeAotCompiler)' == 'true'"
281-
Include="$(ProductMonikerRid)" />
282-
283-
<Crossgen2SupportedRids
284-
Condition="'$(BundleCrossgen2)' == 'true'"
285-
Include="$(ProductMonikerRid)" />
286-
287279
<Net60MonoRuntimePackRids Include="
288280
@(Net60RuntimePackRids);
289281
browser-wasm;
@@ -376,6 +368,12 @@
376368

377369
<Crossgen2SupportedRids Include="@(Net90Crossgen2SupportedRids);" />
378370

371+
<Crossgen2SupportedPortableRids Include="@(Crossgen2SupportedRids)" />
372+
373+
<Crossgen2SupportedRids
374+
Condition="'$(BundleCrossgen2)' == 'true'"
375+
Include="$(ProductMonikerRid)" />
376+
379377
<Net70ILCompilerSupportedRids Include="
380378
linux-arm64;
381379
linux-musl-arm64;
@@ -410,6 +408,12 @@
410408
linux-musl-riscv64;
411409
" />
412410

411+
<ILCompilerSupportedPortableRids Include="@(ILCompilerSupportedRids)" />
412+
413+
<ILCompilerSupportedRids
414+
Condition="'$(BundleNativeAotCompiler)' == 'true'"
415+
Include="$(ProductMonikerRid)" />
416+
413417
<Net80NativeAOTRuntimePackRids Include="
414418
ios-arm64;
415419
iossimulator-arm64;
@@ -703,6 +707,7 @@ Copyright (c) .NET Foundation. All rights reserved.
703707
TargetFramework="net10.0"
704708
Crossgen2PackNamePattern="Microsoft.NETCore.App.Crossgen2.**RID**"
705709
Crossgen2PackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
710+
Crossgen2PortableRuntimeIdentifiers="@(Crossgen2SupportedPortableRids, '%3B')"
706711
Crossgen2RuntimeIdentifiers="@(Crossgen2SupportedRids, '%3B')"
707712
/>
708713
@@ -711,6 +716,7 @@ Copyright (c) .NET Foundation. All rights reserved.
711716
ILCompilerPackNamePattern="runtime.**RID**.Microsoft.DotNet.ILCompiler"
712717
ILCompilerRuntimePackNamePattern="Microsoft.NETCore.App.Runtime.NativeAOT.**RID**"
713718
ILCompilerPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
719+
ILCompilerPortableRuntimeIdentifiers="@(ILCompilerSupportedPortableRids, '%3B')"
714720
ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')"
715721
/>
716722

0 commit comments

Comments
 (0)