Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eng/InstallRuntimes.proj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

From Versions.props:

$(MicrosoftDotnetSdkVersion) - .NET SDK to use for testing
$(MicrosoftNetSdkVersion) - .NET SDK to use for testing
$(InternalReleaseTesting) - if true, internal service release testing
$(PrivateBuildTesting) - if true, test against a locally built runtime
@(RuntimeTestVersions) - runtime/aspnetcore versions to install and test against
Expand Down Expand Up @@ -67,7 +67,7 @@
Condition="$([MSBuild]::IsOsPlatform(Windows))"
Inputs="$(VersionsPropsPath)" Outputs="$(TestConfigFileName)">

<Exec Command="$(PowershellWrapper) &quot;&amp; { &amp;$(DotnetInstallScriptCmd) $(CommonInstallArgs) -Version $(MicrosoftDotnetSdkVersion) }&quot;"
<Exec Command="$(PowershellWrapper) &quot;&amp; { &amp;$(DotnetInstallScriptCmd) $(CommonInstallArgs) -Version $(MicrosoftNetSdkVersion) }&quot;"
IgnoreStandardErrorWarningFormat="true" />

<Exec Command="$(PowershellWrapper) &quot;&amp; { &amp;$(DotnetInstallScriptCmd) $(CommonInstallArgs) %(RuntimeTestVersions.ExtraInstallArgs) -Version %(RuntimeTestVersions.RuntimeDownload) -Runtime dotnet }&quot;"
Expand All @@ -85,7 +85,7 @@
Condition="!$([MSBuild]::IsOsPlatform(Windows))"
Inputs="$(VersionsPropsPath)" Outputs="$(TestConfigFileName)">

<Exec Command="bash $(DotnetInstallScriptCmd) $(CommonInstallArgs) -Version $(MicrosoftDotnetSdkVersion)"
<Exec Command="bash $(DotnetInstallScriptCmd) $(CommonInstallArgs) -Version $(MicrosoftNetSdkVersion)"
IgnoreStandardErrorWarningFormat="true" />

<Exec Command="bash $(DotnetInstallScriptCmd) $(CommonInstallArgs) %(RuntimeTestVersions.ExtraInstallArgs) -Version %(RuntimeTestVersions.RuntimeDownload) -Runtime dotnet"
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<MicrosoftAspNetCoreAppRefInternalVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreAppRefInternalVersion>
<MicrosoftAspNetCoreAppRefVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreAppRefVersion>
<!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
<MicrosoftDotnetSdkVersion>10.0.100-alpha.1.24611.5</MicrosoftDotnetSdkVersion>
<MicrosoftNetSdkVersion>10.0.100-alpha.1.24611.5</MicrosoftNetSdkVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Opt-in/out repo features -->
Expand Down
Loading