Skip to content

Commit d972852

Browse files
authored
Add ValidateExecutableReferencesMatchSelfContained (#1725)
* Add ValidateExecutableReferencesMatchSelfContained This is required to make CoreRT work on 5.0.300 SDK * Update SDK to 5.0.301
1 parent 5196e6f commit d972852

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Param(
3232
)
3333

3434
$CakeVersion = "1.1.0"
35-
$DotNetVersion = "5.0.101";
35+
$DotNetVersion = "5.0.301";
3636
$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
3737
$NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
3838

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then
4747
mkdir "$SCRIPT_DIR/.dotnet"
4848
fi
4949
curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" https://dot.net/v1/dotnet-install.sh
50-
bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version 5.0.101 --install-dir .dotnet --no-path
50+
bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version 5.0.301 --install-dir .dotnet --no-path
5151
export PATH="$SCRIPT_DIR/.dotnet":$PATH
5252
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
5353
export DOTNET_CLI_TELEMETRY_OPTOUT=1

src/BenchmarkDotNet/Toolchains/CoreRt/Generator.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ private string GenerateProjectForNuGetBuild(BuildPartition buildPartition, Artif
137137
<IlcGenerateCompleteTypeMetadata>{ilcGenerateCompleteTypeMetadata}</IlcGenerateCompleteTypeMetadata>
138138
<IlcGenerateStackTraceData>{ilcGenerateStackTraceData}</IlcGenerateStackTraceData>
139139
<EnsureNETCoreAppRuntime>false</EnsureNETCoreAppRuntime> <!-- workaround for 'This runtime may not be supported by.NET Core.' error -->
140+
<ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
140141
</PropertyGroup>
141142
{GetRuntimeSettings(buildPartition.RepresentativeBenchmarkCase.Job.Environment.Gc, buildPartition.Resolver)}
142143
<ItemGroup>
@@ -170,6 +171,7 @@ private string GenerateProjectForLocalBuild(BuildPartition buildPartition, Artif
170171
{GetTrimmingSettings()}
171172
<IlcGenerateCompleteTypeMetadata>{ilcGenerateCompleteTypeMetadata}</IlcGenerateCompleteTypeMetadata>
172173
<IlcGenerateStackTraceData>{ilcGenerateStackTraceData}</IlcGenerateStackTraceData>
174+
<ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
173175
</PropertyGroup>
174176
<Import Project=""$(MSBuildSDKsPath)\Microsoft.NET.Sdk\Sdk\Sdk.targets"" />
175177
<Import Project=""$(IlcPath)\build\Microsoft.NETCore.Native.targets"" />

0 commit comments

Comments
 (0)