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

revert rc3->preview5

Browse source
This commit is contained in:
PiotrP 2017-01-11 13:18:44 -08:00
parent 9008aaff85
commit c008e85f6a
9 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
View file

@ -10,7 +10,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SdkNugetVersion Condition=" '$(SdkNugetVersion)' == ''">1.0.0-rc3-*</SdkNugetVersion> <SdkNugetVersion Condition=" '$(SdkNugetVersion)' == ''">1.0.0-preview5-*</SdkNugetVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

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>Microsoft .NET Core 1.0.3 - SDK RC 3</SdkBrandName> <SdkBrandName>Microsoft .NET Core 1.0.3 - SDK Preview 5</SdkBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core 1.0.3 - Runtime</SharedFrameworkBrandName> <SharedFrameworkBrandName>Microsoft .NET Core 1.0.3 - Runtime</SharedFrameworkBrandName>
<SharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</SharedHostBrandName> <SharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</SharedHostBrandName>
<HostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</HostFxrBrandName> <HostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</HostFxrBrandName>

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

@ -72,7 +72,7 @@
<VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge> <VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
<SdkVersion>$(NugetVersion)</SdkVersion> <SdkVersion>$(NugetVersion)</SdkVersion>
<SdkNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-rc3-$(CommitCount)</SdkNugetVersion> <SdkNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-preview5-$(CommitCount)</SdkNugetVersion>
<ProjectModelNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount)</ProjectModelNugetVersion> <ProjectModelNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount)</ProjectModelNugetVersion>
<DependencyModelAndInternalAbstractionsNugetVersion>$(VersionMajor).$(VersionMinor).1-beta-$(CommitCount)</DependencyModelAndInternalAbstractionsNugetVersion> <DependencyModelAndInternalAbstractionsNugetVersion>$(VersionMajor).$(VersionMinor).1-beta-$(CommitCount)</DependencyModelAndInternalAbstractionsNugetVersion>

2
build/package/Microsoft.DotNet.Cli.Nupkg.targets
View file

@ -26,7 +26,7 @@
Output="$(NupkgOutputDirectory)" Output="$(NupkgOutputDirectory)"
ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj" ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj"
ToolPath="$(Stage0Directory)" ToolPath="$(Stage0Directory)"
VersionSuffix="rc3-$(NupkgVersionSuffix)" VersionSuffix="preview5-$(NupkgVersionSuffix)"
Configuration="$(Configuration)" /> Configuration="$(Configuration)" />
</Target> </Target>

2
build/test/TestPackageProjects.targets
View file

@ -76,7 +76,7 @@
<IsTool>True</IsTool> <IsTool>True</IsTool>
<IsApplicable>True</IsApplicable> <IsApplicable>True</IsApplicable>
<VersionPrefix>$(CliVersionPrefix)-</VersionPrefix> <VersionPrefix>$(CliVersionPrefix)-</VersionPrefix>
<VersionSuffix>rc3-$(TestPackageBuildVersionSuffix)</VersionSuffix> <VersionSuffix>preview5-$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean> <Clean>False</Clean>
<Frameworks>netstandard1.5</Frameworks> <Frameworks>netstandard1.5</Frameworks>
</BaseTestPackageProject> </BaseTestPackageProject>

2
dir.props
View file

@ -12,7 +12,7 @@
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<CliVersionPrefix>1.0.0-rc3</CliVersionPrefix> <CliVersionPrefix>1.0.0-preview5</CliVersionPrefix>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

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.0-rc3" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Action="write" Name="1.0.0-preview5" Type="integer" Value="1" KeyPath="yes"/>
</RegistryKey> </RegistryKey>
</Component> </Component>
</ComponentGroup> </ComponentGroup>

2
src/dotnet/commands/dotnet-new/CSharp_Console/Program.cs
View file

@ -9,4 +9,4 @@ namespace ConsoleApp
Console.WriteLine("Hello World!"); Console.WriteLine("Hello World!");
} }
} }
} }

2
src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj
View file

@ -4,4 +4,4 @@
<TargetFramework>netstandard1.4</TargetFramework> <TargetFramework>netstandard1.4</TargetFramework>
</PropertyGroup> </PropertyGroup>
</Project> </Project>