File tree Expand file tree Collapse file tree 7 files changed +18
-4
lines changed
Components/benchmarkapps/Wasm.Performance/Driver
Framework/App.Runtime/src Expand file tree Collapse file tree 7 files changed +18
-4
lines changed Original file line number Diff line number Diff line change 173173 freebsd-x64
174174 </SupportedRuntimeIdentifiers >
175175
176+ <SupportedRuntimeIdentifiers Condition =" '$(PortableBuild)' == 'false' " >$(SupportedRuntimeIdentifiers);$(TargetRuntimeIdentifier)</SupportedRuntimeIdentifiers >
177+
176178 <!-- Make error messages clickable in VS Code's console -->
177179 <GenerateFullPaths Condition =" '$(VSCODE_CWD)' != '' OR '$(TERM_PROGRAM)' == 'vscode'" >true</GenerateFullPaths >
178180
Original file line number Diff line number Diff line change 66 <TargetOsName Condition =" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('FreeBSD'))" >freebsd</TargetOsName >
77 <TargetArchitecture Condition =" '$(TargetArchitecture)' == ''" >x64</TargetArchitecture >
88 <TargetRuntimeIdentifier Condition =" '$(TargetRuntimeIdentifier)' == ''" >$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier >
9+ <PortableBuild Condition =" '$(PortableBuild)' == ''" >true</PortableBuild >
10+ <DefaultAppHostRuntimeIdentifier Condition =" '$(PortableBuild)' == 'false' " >$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier >
911 </PropertyGroup >
1012
1113 <PropertyGroup Condition =" '$(BuildAllProjects)' == 'true' " >
Original file line number Diff line number Diff line change @@ -95,6 +95,7 @@ and are generated based on the last package release.
9595 <LatestPackageReference Include =" Microsoft.NETCore.App.Runtime.linux-musl-x64" />
9696 <LatestPackageReference Include =" Microsoft.NETCore.App.Runtime.linux-musl-arm" />
9797 <LatestPackageReference Include =" Microsoft.NETCore.App.Runtime.linux-musl-arm64" />
98+ <LatestPackageReference Include =" Microsoft.NETCore.App.Runtime.$(TargetRuntimeIdentifier)" Condition =" '$(PortableBuild)' == 'false' " />
9899
99100 <!-- Crossgen2 compiler -->
100101 <LatestPackageReference Include =" Microsoft.NETCore.App.Crossgen2.osx-x64" />
@@ -109,6 +110,7 @@ and are generated based on the last package release.
109110 <LatestPackageReference Include =" Microsoft.NETCore.App.Crossgen2.win-x86" />
110111 <LatestPackageReference Include =" Microsoft.NETCore.App.Crossgen2.win-arm" />
111112 <LatestPackageReference Include =" Microsoft.NETCore.App.Crossgen2.win-arm64" />
113+ <LatestPackageReference Include =" Microsoft.NETCore.App.Crossgen2.$(TargetRuntimeIdentifier)" Condition =" '$(PortableBuild)' == 'false' " />
112114 </ItemGroup >
113115
114116 <ItemGroup Label =" .NET team dependencies (Non-source-build)" Condition =" '$(DotNetBuildFromSource)' != 'true'" >
Original file line number Diff line number Diff line change 3939 <DefaultRuntimeFrameworkVersion Condition=" '$(IsServicingBuild)' != 'true' AND
4040 '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' AND
4141 '$(TargetLatestDotNetRuntime)' != 'false' ">${MicrosoftNETCoreAppRuntimeVersion}</DefaultRuntimeFrameworkVersion>
42+ <RuntimePackRuntimeIdentifiers Condition=" '$(PortableBuild)' == 'false' ">$(TargetRuntimeIdentifier)</RuntimePackRuntimeIdentifiers>
4243 </KnownFrameworkReference>
4344
45+ <KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2" Condition=" '$(PortableBuild)' == 'false' ">
46+ <Crossgen2PackVersion
47+ Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</Crossgen2PackVersion>
48+ <Crossgen2RuntimeIdentifiers>$(TargetRuntimeIdentifier)</Crossgen2RuntimeIdentifiers>
49+ </KnownCrossgen2Pack>
50+
4451 <!-- Use the just-built ASP.NET Core shared framework if available except when building product code in servicing. -->
4552 <KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition=" $(UpdateAspNetCoreKnownFramework) ">
4653 <LatestRuntimeFrameworkVersion
Original file line number Diff line number Diff line change 88 <!-- WebDriver is not strong-named, so this test project cannot be strong named either. -->
99 <SignAssembly >false</SignAssembly >
1010 <IsTestAssetProject >true</IsTestAssetProject >
11- <RuntimeIdentifier >linux-x64</RuntimeIdentifier >
11+ <RuntimeIdentifier Condition = " '$(DotNetBuildFromSource)' != 'true' " >linux-x64</RuntimeIdentifier >
1212 </PropertyGroup >
1313
1414 <ItemGroup >
Original file line number Diff line number Diff line change @@ -96,7 +96,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
9696 <Crossgen2ToolFileName Condition =" '$(TargetOsName)' == 'win' " >$(Crossgen2ToolFileName).exe</Crossgen2ToolFileName >
9797
9898 <!-- E.g. "PkgMicrosoft_NETCore_App_Runtime_win-x64" (set in obj/Microsoft.AspNetCore.App.Runtime.csproj.nuget.g.props). -->
99- <RuntimePackageRootVariableName >PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier)</RuntimePackageRootVariableName >
99+ <RuntimePackageRootVariableName >PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier.Replace('.', '_') )</RuntimePackageRootVariableName >
100100
101101 <!--
102102 Determine the crossgen2 package path property name. Special case linux-musl-arm and linux-musl-arm64 because they
@@ -105,9 +105,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant
105105 -->
106106 <BuildOsName >$(TargetOsName)</BuildOsName >
107107 <BuildOsName Condition =" '$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)'!='x64'" >linux</BuildOsName >
108+ <BuildOsName Condition =" '$(PortableBuild)' == 'false' " >$(TargetRuntimeIdentifier.Substring(0,$(TargetRuntimeIdentifier.IndexOf('-'))))</BuildOsName >
108109 <Crossgen2BuildArchitecture Condition =" '$(BuildOsName)' == 'win' " >x64</Crossgen2BuildArchitecture >
109110 <Crossgen2BuildArchitecture Condition =" '$(Crossgen2BuildArchitecture)' == '' " >$(BuildArchitecture)</Crossgen2BuildArchitecture >
110- <Crossgen2PackageRootVariableName >PkgMicrosoft_NETCore_App_Crossgen2_$(BuildOsName)-$(Crossgen2BuildArchitecture)</Crossgen2PackageRootVariableName >
111+ <Crossgen2PackageRootVariableName >PkgMicrosoft_NETCore_App_Crossgen2_$(BuildOsName.Replace('.', '_') )-$(Crossgen2BuildArchitecture)</Crossgen2PackageRootVariableName >
111112
112113 <AssetTargetFallback >$(AssetTargetFallback);native,Version=0.0</AssetTargetFallback >
113114
Original file line number Diff line number Diff line change 11<Project >
22 <PropertyGroup Condition =" '$(PackAsTool)' == 'true' " >
33 <!-- Microsoft tool packages are required to target both x64 and x86. -->
4- <PackAsToolShimRuntimeIdentifiers Condition =" '$(IsShippingPackage)' == 'true' " >win-x64;win-x86</PackAsToolShimRuntimeIdentifiers >
4+ <PackAsToolShimRuntimeIdentifiers Condition =" '$(IsShippingPackage)' == 'true' AND '$(DotNetBuildFromSource)' != 'true' " >win-x64;win-x86</PackAsToolShimRuntimeIdentifiers >
55 <!-- None of the tool projects are project reference providers. -->
66 <IsProjectReferenceProvider >false</IsProjectReferenceProvider >
77 <!--
You can’t perform that action at this time.
0 commit comments