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

Merge pull request #4639 from livarcocc/change_to_preview4

Browse source 
Updating the CLI version to preview4.
This commit is contained in:
Livar 2016-11-07 16:12:56 -08:00 • committed by GitHub
commit 8a12994263
23 changed files with 27 additions and 27 deletions
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=0 MINOR_VERSION=0
PATCH_VERSION=0 PATCH_VERSION=0
RELEASE_SUFFIX=preview3 RELEASE_SUFFIX=preview4
CHANNEL=rel-1.0.0 CHANNEL=rel-1.0.0
BRANCH_NAME=rel/1.0.0 BRANCH_NAME=rel/1.0.0

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

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

@ -73,7 +73,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)-preview3-$(CommitCount)</SdkNugetVersion> <SdkNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-preview4-$(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="preview3-$(NupkgVersionSuffix)" VersionSuffix="preview4-$(NupkgVersionSuffix)"
Configuration="$(Configuration)" /> Configuration="$(Configuration)" />
</Target> </Target>

2
build/test/TestPackageProjects.targets
View file

@ -156,7 +156,7 @@
<Name>Microsoft.DotNet.Cli.Utils</Name> <Name>Microsoft.DotNet.Cli.Utils</Name>
<IsTool>True</IsTool> <IsTool>True</IsTool>
<IsApplicable>True</IsApplicable> <IsApplicable>True</IsApplicable>
<VersionPrefix>1.0.0-preview3-</VersionPrefix> <VersionPrefix>1.0.0-preview4-</VersionPrefix>
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix> <VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean> <Clean>False</Clean>
<Frameworks>netstandard1.5</Frameworks> <Frameworks>netstandard1.5</Frameworks>

2
src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
View file

@ -2,7 +2,7 @@
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup> <PropertyGroup>
<Description>Archive and compression types.</Description> <Description>Archive and compression types.</Description>
<VersionPrefix>1.0.0-preview3</VersionPrefix> <VersionPrefix>1.0.0-preview4</VersionPrefix>
<TargetFramework>netstandard1.3</TargetFramework> <TargetFramework>netstandard1.3</TargetFramework>
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>

2
src/Microsoft.DotNet.Archive/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-preview3-*", "version": "1.0.0-preview4-*",
"buildOptions": { "buildOptions": {
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },

2
src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
View file

@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup> <PropertyGroup>
<VersionPrefix>1.0.0-preview3</VersionPrefix> <VersionPrefix>1.0.0-preview4</VersionPrefix>
<TargetFrameworks>netstandard1.5;net46</TargetFrameworks> <TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
<WarningsAsErrors>true</WarningsAsErrors> <WarningsAsErrors>true</WarningsAsErrors>
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>

2
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-preview3-*", "version": "1.0.0-preview4-*",
"buildOptions": { "buildOptions": {
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"warningsAsErrors": true "warningsAsErrors": true

2
src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj
View file

@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup> <PropertyGroup>
<VersionPrefix>1.0.0-preview3</VersionPrefix> <VersionPrefix>1.0.0-preview4</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<WarningsAsErrors>true</WarningsAsErrors> <WarningsAsErrors>true</WarningsAsErrors>
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>

2
src/Microsoft.DotNet.ProjectJsonMigration/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-preview3-*", "version": "1.0.0-preview4-*",
"buildOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",

2
src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj
View file

@ -2,7 +2,7 @@
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup> <PropertyGroup>
<Description>Microsoft.DotNet.TestFramework Class Library</Description> <Description>Microsoft.DotNet.TestFramework Class Library</Description>
<VersionPrefix>1.0.0-preview3</VersionPrefix> <VersionPrefix>1.0.0-preview4</VersionPrefix>
<TargetFrameworks>netstandard1.5;net46</TargetFrameworks> <TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>

2
src/Microsoft.DotNet.TestFramework/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-preview3-*", "version": "1.0.0-preview4-*",
"description": "Microsoft.DotNet.TestFramework Class Library", "description": "Microsoft.DotNet.TestFramework Class Library",
"buildOptions": { "buildOptions": {
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"

2
src/dotnet/dotnet.csproj
View file

@ -2,7 +2,7 @@
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup> <PropertyGroup>
<VersionPrefix>1.0.0-preview3</VersionPrefix> <VersionPrefix>1.0.0-preview4</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<AssemblyName>dotnet</AssemblyName> <AssemblyName>dotnet</AssemblyName>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

2
src/dotnet/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-preview3-*", "version": "1.0.0-preview4-*",
"buildOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",

10
src/redist/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-preview3-*", "version": "1.0.0-preview4-*",
"buildOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"copyToOutput": { "copyToOutput": {
@ -14,10 +14,10 @@
"type": "platform", "type": "platform",
"version": "1.0.1" "version": "1.0.1"
}, },
"tool_csc": "1.0.0-preview3-*", "tool_csc": "1.0.0-preview4-*",
"dotnet": "1.0.0-preview3-*", "dotnet": "1.0.0-preview4-*",
"tool_nuget": "1.0.0-preview3-*", "tool_nuget": "1.0.0-preview4-*",
"tool_msbuild": "1.0.0-preview3-*", "tool_msbuild": "1.0.0-preview4-*",
"Microsoft.Build.Runtime": "15.1.0-preview-000370-00", "Microsoft.Build.Runtime": "15.1.0-preview-000370-00",
"Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-beta6-60922-08", "Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-beta6-60922-08",

2
src/redist/redist.csproj
View file

@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup> <PropertyGroup>
<VersionPrefix>1.0.0-preview3</VersionPrefix> <VersionPrefix>1.0.0-preview4</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;netstandardapp1.5;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50</PackageTargetFallback> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;netstandardapp1.5;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50</PackageTargetFallback>

2
src/tool_csc/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-preview3-*", "version": "1.0.0-preview4-*",
"buildOptions": { "buildOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },

2
src/tool_csc/tool_csc.csproj
View file

@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup> <PropertyGroup>
<VersionPrefix>1.0.0-preview3</VersionPrefix> <VersionPrefix>1.0.0-preview4</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
</PropertyGroup> </PropertyGroup>

2
src/tool_msbuild/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-preview3-*", "version": "1.0.0-preview4-*",
"buildOptions": { "buildOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },

2
src/tool_msbuild/tool_msbuild.csproj
View file

@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup> <PropertyGroup>
<VersionPrefix>1.0.0-preview3</VersionPrefix> <VersionPrefix>1.0.0-preview4</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
</PropertyGroup> </PropertyGroup>

2
src/tool_nuget/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-preview3-*", "version": "1.0.0-preview4-*",
"buildOptions": { "buildOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },

2
src/tool_nuget/tool_nuget.csproj
View file

@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup> <PropertyGroup>
<VersionPrefix>1.0.0-preview3</VersionPrefix> <VersionPrefix>1.0.0-preview4</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>