File tree 7 files changed +18
-4
lines changed
Components/benchmarkapps/Wasm.Performance/Driver
Framework/App.Runtime/src 7 files changed +18
-4
lines changed Original file line number Diff line number Diff line change 173
173
freebsd-x64
174
174
</SupportedRuntimeIdentifiers >
175
175
176
+ <SupportedRuntimeIdentifiers Condition =" '$(PortableBuild)' == 'false' " >$(SupportedRuntimeIdentifiers);$(TargetRuntimeIdentifier)</SupportedRuntimeIdentifiers >
177
+
176
178
<!-- Make error messages clickable in VS Code's console -->
177
179
<GenerateFullPaths Condition =" '$(VSCODE_CWD)' != '' OR '$(TERM_PROGRAM)' == 'vscode'" >true</GenerateFullPaths >
178
180
Original file line number Diff line number Diff line change 6
6
<TargetOsName Condition =" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('FreeBSD'))" >freebsd</TargetOsName >
7
7
<TargetArchitecture Condition =" '$(TargetArchitecture)' == ''" >x64</TargetArchitecture >
8
8
<TargetRuntimeIdentifier Condition =" '$(TargetRuntimeIdentifier)' == ''" >$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier >
9
+ <PortableBuild Condition =" '$(PortableBuild)' == ''" >true</PortableBuild >
10
+ <DefaultAppHostRuntimeIdentifier Condition =" '$(PortableBuild)' == 'false' " >$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier >
9
11
</PropertyGroup >
10
12
11
13
<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.
95
95
<LatestPackageReference Include =" Microsoft.NETCore.App.Runtime.linux-musl-x64" />
96
96
<LatestPackageReference Include =" Microsoft.NETCore.App.Runtime.linux-musl-arm" />
97
97
<LatestPackageReference Include =" Microsoft.NETCore.App.Runtime.linux-musl-arm64" />
98
+ <LatestPackageReference Include =" Microsoft.NETCore.App.Runtime.$(TargetRuntimeIdentifier)" Condition =" '$(PortableBuild)' == 'false' " />
98
99
99
100
<!-- Crossgen2 compiler -->
100
101
<LatestPackageReference Include =" Microsoft.NETCore.App.Crossgen2.osx-x64" />
@@ -109,6 +110,7 @@ and are generated based on the last package release.
109
110
<LatestPackageReference Include =" Microsoft.NETCore.App.Crossgen2.win-x86" />
110
111
<LatestPackageReference Include =" Microsoft.NETCore.App.Crossgen2.win-arm" />
111
112
<LatestPackageReference Include =" Microsoft.NETCore.App.Crossgen2.win-arm64" />
113
+ <LatestPackageReference Include =" Microsoft.NETCore.App.Crossgen2.$(TargetRuntimeIdentifier)" Condition =" '$(PortableBuild)' == 'false' " />
112
114
</ItemGroup >
113
115
114
116
<ItemGroup Label =" .NET team dependencies (Non-source-build)" Condition =" '$(DotNetBuildFromSource)' != 'true'" >
Original file line number Diff line number Diff line change 39
39
<DefaultRuntimeFrameworkVersion Condition=" '$(IsServicingBuild)' != 'true' AND
40
40
'%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' AND
41
41
'$(TargetLatestDotNetRuntime)' != 'false' ">${MicrosoftNETCoreAppRuntimeVersion}</DefaultRuntimeFrameworkVersion>
42
+ <RuntimePackRuntimeIdentifiers Condition=" '$(PortableBuild)' == 'false' ">$(TargetRuntimeIdentifier)</RuntimePackRuntimeIdentifiers>
42
43
</KnownFrameworkReference>
43
44
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
+
44
51
<!-- Use the just-built ASP.NET Core shared framework if available except when building product code in servicing. -->
45
52
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition=" $(UpdateAspNetCoreKnownFramework) ">
46
53
<LatestRuntimeFrameworkVersion
Original file line number Diff line number Diff line change 8
8
<!-- WebDriver is not strong-named, so this test project cannot be strong named either. -->
9
9
<SignAssembly >false</SignAssembly >
10
10
<IsTestAssetProject >true</IsTestAssetProject >
11
- <RuntimeIdentifier >linux-x64</RuntimeIdentifier >
11
+ <RuntimeIdentifier Condition = " '$(DotNetBuildFromSource)' != 'true' " >linux-x64</RuntimeIdentifier >
12
12
</PropertyGroup >
13
13
14
14
<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
96
96
<Crossgen2ToolFileName Condition =" '$(TargetOsName)' == 'win' " >$(Crossgen2ToolFileName).exe</Crossgen2ToolFileName >
97
97
98
98
<!-- 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 >
100
100
101
101
<!--
102
102
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
105
105
-->
106
106
<BuildOsName >$(TargetOsName)</BuildOsName >
107
107
<BuildOsName Condition =" '$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)'!='x64'" >linux</BuildOsName >
108
+ <BuildOsName Condition =" '$(PortableBuild)' == 'false' " >$(TargetRuntimeIdentifier.Substring(0,$(TargetRuntimeIdentifier.IndexOf('-'))))</BuildOsName >
108
109
<Crossgen2BuildArchitecture Condition =" '$(BuildOsName)' == 'win' " >x64</Crossgen2BuildArchitecture >
109
110
<Crossgen2BuildArchitecture Condition =" '$(Crossgen2BuildArchitecture)' == '' " >$(BuildArchitecture)</Crossgen2BuildArchitecture >
110
- <Crossgen2PackageRootVariableName >PkgMicrosoft_NETCore_App_Crossgen2_$(BuildOsName)-$(Crossgen2BuildArchitecture)</Crossgen2PackageRootVariableName >
111
+ <Crossgen2PackageRootVariableName >PkgMicrosoft_NETCore_App_Crossgen2_$(BuildOsName.Replace('.', '_') )-$(Crossgen2BuildArchitecture)</Crossgen2PackageRootVariableName >
111
112
112
113
<AssetTargetFallback >$(AssetTargetFallback);native,Version=0.0</AssetTargetFallback >
113
114
Original file line number Diff line number Diff line change 1
1
<Project >
2
2
<PropertyGroup Condition =" '$(PackAsTool)' == 'true' " >
3
3
<!-- 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 >
5
5
<!-- None of the tool projects are project reference providers. -->
6
6
<IsProjectReferenceProvider >false</IsProjectReferenceProvider >
7
7
<!--
You can’t perform that action at this time.
0 commit comments