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

Merge pull request #6797 from livarcocc/update_branding_and_sdk

Browse source 
Updating the 1.1.0 branding to preview1 from rc4
This commit is contained in:
Livar 2017-06-08 11:39:51 -07:00 committed by GitHub
commit af1f75958a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
branchinfo.txt
View file

@ -4,6 +4,6 @@
MAJOR_VERSION=1 MAJOR_VERSION=1
MINOR_VERSION=1 MINOR_VERSION=1
PATCH_VERSION=0 PATCH_VERSION=0
RELEASE_SUFFIX=rc4 RELEASE_SUFFIX=preview1
CHANNEL=rel-1.1.0 CHANNEL=rel-1.1.0
BRANCH_NAME=rel/1.1.0 BRANCH_NAME=rel/1.1.0

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

@ -4,7 +4,7 @@
<CLI_SharedFrameworkVersion>1.1.2</CLI_SharedFrameworkVersion> <CLI_SharedFrameworkVersion>1.1.2</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.3.0-preview-000378-01</CLI_MSBuild_Version> <CLI_MSBuild_Version>15.3.0-preview-000378-01</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.1.0-alpha-20170525-2</CLI_NETSDK_Version> <CLI_NETSDK_Version>1.1.0-alpha-20170607-4</CLI_NETSDK_Version>
<CLI_NuGet_Version>4.3.0-preview3-4146</CLI_NuGet_Version> <CLI_NuGet_Version>4.3.0-preview3-4146</CLI_NuGet_Version>
<CLI_WEBSDK_Version>1.0.0-alpha-20170516-2-509</CLI_WEBSDK_Version> <CLI_WEBSDK_Version>1.0.0-alpha-20170516-2-509</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.0.0</CLI_TestPlatform_Version> <CLI_TestPlatform_Version>15.0.0</CLI_TestPlatform_Version>

2
packaging/windows/clisdk/registrykeys.wxs
View file

@ -10,7 +10,7 @@
</Component> </Component>
<Component Id="SetupRegistry_x86_RC2_Compat_Key" Directory="TARGETDIR" Win64="no"> <Component Id="SetupRegistry_x86_RC2_Compat_Key" Directory="TARGETDIR" Win64="no">
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.Platform)\sdk"> <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.Platform)\sdk">
<RegistryValue Action="write" Name="1.0.1-rc4" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Action="write" Name="1.1.0-preview1" Type="integer" Value="1" KeyPath="yes"/>
</RegistryKey> </RegistryKey>
</Component> </Component>
</ComponentGroup> </ComponentGroup>