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

Merge pull request #6041 from livarcocc/update_msbuild

Browse source 
Updating the CLI branding to 1.0.2 and updating the msbuild version.
This commit is contained in:
Livar 2017-03-15 11:01:20 -07:00 committed by GitHub
commit 54743c8b7b
4 changed files with 4 additions and 4 deletions
Show stats 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=1 PATCH_VERSION=2
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

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

@ -2,7 +2,7 @@
<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.1</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.1.548</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-20170224-6</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>

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

@ -1,7 +1,7 @@
<?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.1</SdkBrandName> <SdkBrandName>.NET Core SDK 1.0.2</SdkBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core 1.1.1 - Runtime</SharedFrameworkBrandName> <SharedFrameworkBrandName>Microsoft .NET Core 1.1.1 - 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>

2
dir.props
View file

@ -13,6 +13,6 @@
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<CliVersionPrefix>1.0.1</CliVersionPrefix> <CliVersionPrefix>1.0.2</CliVersionPrefix>
</PropertyGroup> </PropertyGroup>
</Project> </Project>