Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit d2f3571

Browse files
author
Livar
authored
Merge pull request #7664 from livarcocc/update_runtime_to_stable_version
Moving the runtime dependency to 1.0.7 and 1.1.4.
2 parents 071da27 + d67473b commit d2f3571

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build/Microsoft.DotNet.Cli.DependencyVersions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<CLI_SharedFrameworkVersion>1.1.3</CLI_SharedFrameworkVersion>
5-
<CLI_CoreCLRVersion>1.1.3</CLI_CoreCLRVersion>
6-
<CLI_JitVersion>1.1.3</CLI_JitVersion>
4+
<CLI_SharedFrameworkVersion>1.1.4</CLI_SharedFrameworkVersion>
5+
<CLI_CoreCLRVersion>1.1.4</CLI_CoreCLRVersion>
6+
<CLI_JitVersion>1.1.4</CLI_JitVersion>
77
<CLI_SharedHostVersion>1.1.0</CLI_SharedHostVersion>
88
<CLI_HostFxrContainerVersion>1.1.0</CLI_HostFxrContainerVersion>
99
<CLI_HostFxrVersion Condition="'$(OS)' != 'Windows_NT'">1.1.0</CLI_HostFxrVersion>
1010
<CLI_HostFxrVersion Condition="'$(OS)' == 'Windows_NT'">1.1.2</CLI_HostFxrVersion>
1111

12-
<CLI_SharedFrameworkVersion_1_0>1.0.6</CLI_SharedFrameworkVersion_1_0>
12+
<CLI_SharedFrameworkVersion_1_0>1.0.7</CLI_SharedFrameworkVersion_1_0>
1313
<CLI_SharedHostVersion_1_0>1.0.1</CLI_SharedHostVersion_1_0>
1414
<CLI_HostFxrContainerVersion_1_0>1.0.1</CLI_HostFxrContainerVersion_1_0>
1515
<CLI_HostFxrVersion_1_0 Condition="'$(OS)' != 'Windows_NT'">1.0.1</CLI_HostFxrVersion_1_0>

build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public override bool Execute()
4848
{
4949
ToolPath = ToolPath,
5050
TemplateType = newArgs[0],
51-
TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\"",
51+
TemplateArgs = newArgs[1] + $" --no-restore --debug:ephemeral-hive -n TempProject -o \"{outputDir}\"",
5252
HostObject = HostObject,
5353
BuildEngine = BuildEngine
5454
};

test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ public void ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile()
308308

309309
result.Should().NotBeNull();
310310

311-
result.Args.Should().Contain("--fx-version 1.1.3");
311+
result.Args.Should().Contain("--fx-version 1.1.4");
312312
}
313313

314314
[Fact]

0 commit comments

Comments
 (0)