Skip to content

Commit 37224c9

Browse files
author
Livar
authoredApr 7, 2017
Merge pull request dotnet#6265 from livarcocc/fix_vc_redist_detection_logic
Adding error code 1638 as a ignore/success error when installing the VC_Redist.
2 parents ffd6048 + 158eea3 commit 37224c9

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed
 

‎branchinfo.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Each line is expected to be in the format "[Name]=[Value]".
44
MAJOR_VERSION=1
55
MINOR_VERSION=0
6-
PATCH_VERSION=2
6+
PATCH_VERSION=3
77
RELEASE_SUFFIX=rc4
88
CHANNEL=rel-1.0.1
99
BRANCH_NAME=rel/1.0.1

‎build/Microsoft.DotNet.Cli.Monikers.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<SdkBrandName>.NET Core SDK 1.0.2</SdkBrandName>
4+
<SdkBrandName>.NET Core SDK 1.0.3</SdkBrandName>
55
<SharedFrameworkBrandName>Microsoft .NET Core 1.1.1 - Runtime</SharedFrameworkBrandName>
66
<SharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</SharedHostBrandName>
77
<HostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</HostFxrBrandName>

‎dir.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
1414

1515

16-
<CliVersionPrefix>1.0.2</CliVersionPrefix>
16+
<CliVersionPrefix>1.0.3</CliVersionPrefix>
1717
</PropertyGroup>
1818
</Project>

‎packaging/windows/clisdk/bundle.wxs

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
ProductName="$(var.Crt_ProductName)"
4343
Size="$(var.Crt_Size)"
4444
Version="$(var.Crt_Version)" />
45+
<ExitCode Behavior="success" Value="1638" />
4546
</ExePackage>
4647
<MsiPackage SourceFile="$(var.CLISDKMsiSourcePath)">
4748
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />

0 commit comments

Comments
 (0)
Please sign in to comment.