mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updating the runtime framework versions for 1.0.5 and 1.1.1 and updating the CLI branding to 1.0.4.

Browse source
This commit is contained in:
Livar Cunha 2017-04-24 18:11:59 -07:00
parent 022cc5ebfb
commit de7c94592d
8 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
branchinfo.txt
View file

@ -3,7 +3,7 @@
# Each line is expected to be in the format "[Name]=[Value]". # Each line is expected to be in the format "[Name]=[Value]".
MAJOR_VERSION=1 MAJOR_VERSION=1
MINOR_VERSION=0 MINOR_VERSION=0
PATCH_VERSION=3 PATCH_VERSION=4
RELEASE_SUFFIX=rc4 RELEASE_SUFFIX=rc4
CHANNEL=rel-1.0.1 CHANNEL=rel-1.0.1
BRANCH_NAME=rel/1.0.1 BRANCH_NAME=rel/1.0.1

6
build.proj
View file

@ -19,12 +19,12 @@
<CoreSetupChannel>release/1.1.0</CoreSetupChannel> <CoreSetupChannel>release/1.1.0</CoreSetupChannel>
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName> <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
<SharedFrameworkVersion>1.1.1</SharedFrameworkVersion> <SharedFrameworkVersion>1.1.2</SharedFrameworkVersion>
<SharedHostVersion>1.1.0</SharedHostVersion> <SharedHostVersion>1.1.0</SharedHostVersion>
<HostFxrVersion>1.1.0</HostFxrVersion> <HostFxrVersion>1.1.0</HostFxrVersion>
<CoreCLRVersion>1.1.1</CoreCLRVersion> <CoreCLRVersion>1.1.2</CoreCLRVersion>
<JitVersion>1.1.1</JitVersion> <JitVersion>1.1.2</JitVersion>
<ExeExtension>.exe</ExeExtension> <ExeExtension>.exe</ExeExtension>
<ExeExtension Condition=" '$(OS)' != 'Windows_NT' "></ExeExtension> <ExeExtension Condition=" '$(OS)' != 'Windows_NT' "></ExeExtension>

4
build/Microsoft.DotNet.Cli.DependencyVersions.props
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<CLI_SharedFrameworkVersion>1.1.1</CLI_SharedFrameworkVersion> <CLI_SharedFrameworkVersion>1.1.2</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.1.1012</CLI_MSBuild_Version> <CLI_MSBuild_Version>15.1.1012</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.0.0-rc5-61427-04</CLI_Roslyn_Version> <CLI_Roslyn_Version>2.0.0-rc5-61427-04</CLI_Roslyn_Version>
<CLI_NETSDK_Version>1.0.0-alpha-20170224-6</CLI_NETSDK_Version> <CLI_NETSDK_Version>1.0.0-alpha-20170425-3</CLI_NETSDK_Version>
<CLI_NuGet_Version>4.0.0-rtm-2283</CLI_NuGet_Version> <CLI_NuGet_Version>4.0.0-rtm-2283</CLI_NuGet_Version>
<CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version> <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.0.0</CLI_TestPlatform_Version> <CLI_TestPlatform_Version>15.0.0</CLI_TestPlatform_Version>

6
build/Microsoft.DotNet.Cli.Monikers.props
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<SdkBrandName>.NET Core SDK 1.0.3</SdkBrandName> <SdkBrandName>.NET Core SDK 1.0.4</SdkBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core 1.1.1 - Runtime</SharedFrameworkBrandName> <SharedFrameworkBrandName>Microsoft .NET Core 1.1.2 - Runtime</SharedFrameworkBrandName>
<SharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</SharedHostBrandName> <SharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</SharedHostBrandName>
<HostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</HostFxrBrandName> <HostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</HostFxrBrandName>
<AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.0.4 - Runtime</AdditionalSharedFrameworkBrandName> <AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.0.5 - Runtime</AdditionalSharedFrameworkBrandName>
<AdditionalSharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</AdditionalSharedHostBrandName> <AdditionalSharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</AdditionalSharedHostBrandName>
<AdditionalHostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</AdditionalHostFxrBrandName> <AdditionalHostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</AdditionalHostFxrBrandName>

2
build/Microsoft.DotNet.Cli.Prepare.targets
View file

@ -144,7 +144,7 @@
<!-- Additional Shared Framework to be installed --> <!-- Additional Shared Framework to be installed -->
<PropertyGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' == 'true' "> <PropertyGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' == 'true' ">
<AdditionalCoreSetupChannel>preview</AdditionalCoreSetupChannel> <AdditionalCoreSetupChannel>preview</AdditionalCoreSetupChannel>
<AdditionalSharedFrameworkVersion>1.0.4</AdditionalSharedFrameworkVersion> <AdditionalSharedFrameworkVersion>1.0.5</AdditionalSharedFrameworkVersion>
<AdditionalSharedHostVersion>1.0.1</AdditionalSharedHostVersion> <AdditionalSharedHostVersion>1.0.1</AdditionalSharedHostVersion>
<AdditionalHostFxrVersion>1.0.1</AdditionalHostFxrVersion> <AdditionalHostFxrVersion>1.0.1</AdditionalHostFxrVersion>

2
build_projects/dotnet-cli-build/dotnet-cli-build.csproj
View file

@ -17,7 +17,7 @@
<Version>1.6.0</Version> <Version>1.6.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR"> <PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR">
<Version>1.1.1</Version> <Version>1.1.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Build"> <PackageReference Include="Microsoft.Build">
<Version>$(CLI_MSBuild_Version)</Version> <Version>$(CLI_MSBuild_Version)</Version>

2
dir.props
View file

@ -13,6 +13,6 @@
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<CliVersionPrefix>1.0.3</CliVersionPrefix> <CliVersionPrefix>1.0.4</CliVersionPrefix>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
View file

@ -308,7 +308,7 @@ namespace Microsoft.DotNet.Tests
result.Should().NotBeNull(); result.Should().NotBeNull();
result.Args.Should().Contain("--fx-version 1.1.1"); result.Args.Should().Contain("--fx-version 1.1.2");
} }
[Fact] [Fact]