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

Merge pull request #5250 from livarcocc/update_brand_to_rc3

Browse source 
Updating the branding of the CLI to 1.0.0-rc3
This commit is contained in:
Livar 2017-01-10 15:36:22 -08:00 committed by GitHub
commit 839810a390
25 changed files with 74 additions and 69 deletions
Show stats 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

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

2
TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj
View file

@ -7,7 +7,7 @@
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.10-x64;rhel.7-x64</RuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<BuiltProjectOutputGroupOutput Include="$(ProjectRuntimeConfigFilePath)">
<FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
</BuiltProjectOutputGroupOutput>

3
TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj
View file

@ -12,9 +12,6 @@
<PackageReference Include="Newtonsoft.Json">
<Version>5.0.0</Version>
</PackageReference>
<PackageReference Include="NuGet.Protocol.Core.v3">
<Version>3.3.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">

6
branchinfo.txt
View file

@ -4,6 +4,6 @@
MAJOR_VERSION=1
MINOR_VERSION=0
PATCH_VERSION=0
RELEASE_SUFFIX=preview5
CHANNEL=rel-1.0.0
BRANCH_NAME=rel/1.0.0
RELEASE_SUFFIX=rc3
CHANNEL=rel-1.0.0-rc3
BRANCH_NAME=rel/1.0.0-rc3

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SdkBrandName>Microsoft .NET Core 1.0.3 - SDK Preview 5</SdkBrandName>
<SdkBrandName>Microsoft .NET Core 1.0.3 - SDK RC 3</SdkBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core 1.0.3 - Runtime</SharedFrameworkBrandName>
<SharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</SharedHostBrandName>
<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>
<SdkVersion>$(NugetVersion)</SdkVersion>
<SdkNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-preview5-$(CommitCount)</SdkNugetVersion>
<SdkNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-rc3-$(CommitCount)</SdkNugetVersion>
<ProjectModelNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount)</ProjectModelNugetVersion>
<DependencyModelAndInternalAbstractionsNugetVersion>$(VersionMajor).$(VersionMinor).1-beta-$(CommitCount)</DependencyModelAndInternalAbstractionsNugetVersion>

40
build/Microsoft.DotNet.Cli.Test.targets
View file

@ -70,6 +70,8 @@
<TestDirectory>$(RepoRoot)/test/</TestDirectory>
<DotnetUnderTest>$(Stage2Directory)</DotnetUnderTest>
</PropertyGroup>
<MakeDir Directories="$(TestPackagesDir)" Condition="!Exists('$(TestPackagesDir)')"/>
</Target>
<Target Name="BuildTests"
@ -203,16 +205,28 @@
</Target>
<Target Name="CreateTestAssetPackageNuPkgs"
DependsOnTargets="BuildTestAssetPackageProjects;
DependsOnTargets="PrepareTests;
SetupTestPackageProjectData;"
Inputs="%(TestPackageProject.PackInputs)"
Outputs="%(TestPackageProject.PackOutputs)">
<PropertyGroup>
<DotNetPackMsbuildArgs>/p:TargetFramework=%(TestPackageProject.Framework)</DotNetPackMsbuildArgs>
<DotNetPackMsbuildArgs Condition=" '$(IsDesktopAvailable)' == 'True' And '%(TestPackageProject.PackRuntime)' != '' ">/p:RuntimeIdentifier=%(TestPackageProject.PackRuntime)</DotNetPackMsbuildArgs>
<Framework>%(TestPackageProject.Framework)</Framework>
<DoPackRuntime Condition=" '$(Framework)' == 'net45' Or '$(Framework)' == 'net451' ">true</DoPackRuntime>
<DotNetPackMsbuildArgs>/p:TargetFramework=$(Framework)</DotNetPackMsbuildArgs>
<DotNetPackMsbuildArgs Condition=" '$(IsDesktopAvailable)' == 'True' And '%(TestPackageProject.PackRuntime)' != '' And '$(DoPackRuntime)' != '' ">/p:RuntimeIdentifier=%(TestPackageProject.PackRuntime)</DotNetPackMsbuildArgs>
</PropertyGroup>
<DotNetRestore ToolPath="$(Stage2Directory)"
Source="$(TestPackagesDir)"
ConfigFile="$(RepoRoot)\NuGet.Config"
ProjectPath="%(TestPackageProject.ProjectPath)" />
<DotNetBuild Framework="$(Framework)"
Runtime="%(TestPackageProject.Runtime)"
ProjectPath="%(TestPackageProject.ProjectPath)"
ToolPath="$(Stage0Directory)" />
<!-- https://github.com/NuGet/Home/issues/4063 -->
<DotNetPack NoBuild="True"
Output="$(TestPackagesDir)"
@ -221,24 +235,4 @@
VersionSuffix="%(TestPackageProject.VersionSuffix)"
MsbuildArgs="$(DotNetPackMsbuildArgs) /p:SdkNuGetVersion=$(SdkNugetVersion)" />
</Target>
<Target Name="BuildTestAssetPackageProjects"
DependsOnTargets="RestoreTestAssetPackageProjects;
SetupTestPackageProjectData;"
Inputs="%(TestPackageProject.BuildInputs)"
Outputs="%(TestPackageProject.BuildOutputs)">
<DotNetBuild Framework="%(TestPackageProject.Framework)"
Runtime="%(TestPackageProject.Runtime)"
ProjectPath="%(TestPackageProject.ProjectPath)"
ToolPath="$(Stage0Directory)" />
</Target>
<Target Name="RestoreTestAssetPackageProjects"
DependsOnTargets="PrepareTests;
SetupTestPackageProjectData;">
<DotNetRestore ToolPath="$(Stage2Directory)"
WorkingDirectory="%(TestPackageProject.FullPath)" />
</Target>
</Project>

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

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

40
build/test/TestPackageProjects.targets
View file

@ -70,6 +70,26 @@
<Target Name="SetupTestPackageProjectBaseData">
<ItemGroup>
<BaseTestPackageProject Include="src/Microsoft.DotNet.Cli.Utils">
<Name>Microsoft.DotNet.Cli.Utils</Name>
<ProjectName>Microsoft.DotNet.Cli.Utils.csproj</ProjectName>
<IsTool>True</IsTool>
<IsApplicable>True</IsApplicable>
<VersionPrefix>$(CliVersionPrefix)-</VersionPrefix>
<VersionSuffix>rc3-$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean>
<Frameworks>netstandard1.5</Frameworks>
</BaseTestPackageProject>
<BaseTestPackageProject Include="src/Microsoft.DotNet.InternalAbstractions">
<Name>Microsoft.DotNet.InternalAbstractions</Name>
<ProjectName>Microsoft.DotNet.InternalAbstractions.csproj</ProjectName>
<IsTool>True</IsTool>
<IsApplicable>True</IsApplicable>
<VersionPrefix>2.0.0-beta-</VersionPrefix>
<VersionSuffix>beta-$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean>
<Frameworks>netstandard1.3</Frameworks>
</BaseTestPackageProject>
<BaseTestPackageProject Include="TestAssets/TestPackages/PackageWithFakeNativeDep">
<Name>PackageWithFakeNativeDep</Name>
<ProjectName>PackageWithFakeNativeDep.csproj</ProjectName>
@ -176,26 +196,6 @@
<Clean>True</Clean>
<Frameworks>netcoreapp1.0</Frameworks>
</BaseTestPackageProject>
<BaseTestPackageProject Include="src/Microsoft.DotNet.Cli.Utils">
<Name>Microsoft.DotNet.Cli.Utils</Name>
<ProjectName>Microsoft.DotNet.Cli.Utils.csproj</ProjectName>
<IsTool>True</IsTool>
<IsApplicable>True</IsApplicable>
<VersionPrefix>1.0.0-preview5-</VersionPrefix>
<VersionSuffix>preview5-$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean>
<Frameworks>netstandard1.5</Frameworks>
</BaseTestPackageProject>
<BaseTestPackageProject Include="src/Microsoft.DotNet.InternalAbstractions">
<Name>Microsoft.DotNet.InternalAbstractions</Name>
<ProjectName>Microsoft.DotNet.InternalAbstractions.csproj</ProjectName>
<IsTool>True</IsTool>
<IsApplicable>True</IsApplicable>
<VersionPrefix>2.0.0-beta-</VersionPrefix>
<VersionSuffix>beta-$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean>
<Frameworks>netstandard1.3</Frameworks>
</BaseTestPackageProject>
<TestPackageProjectFrameworksExcludes Condition=" '$(IsDesktopAvailable)' != 'True' " Include="net45" />
<TestPackageProjectFrameworksExcludes Condition=" '$(IsDesktopAvailable)' != 'True' " Include="net451" />

14
build_projects/dotnet-cli-build/DotNetRestore.cs
View file

@ -12,9 +12,11 @@ namespace Microsoft.DotNet.Cli.Build
protected override string Args
{
get { return $"{GetProjectPath()} {GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; }
get { return $"{GetProjectPath()} {GetConfigFile()} {GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; }
}
public string ConfigFile { get; set; }
public string AdditionalParameters { get; set; }
public string ProjectPath { get; set; }
@ -27,6 +29,16 @@ namespace Microsoft.DotNet.Cli.Build
public string Runtime { get; set; }
private string GetConfigFile()
{
if (!string.IsNullOrEmpty(ConfigFile))
{
return $"--configfile {ConfigFile}";
}
return null;
}
private string GetSource()
{
if (!string.IsNullOrEmpty(Source))

2
dir.props
View file

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

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

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

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

@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Archive and compression types.</Description>
<VersionPrefix>1.0.0-preview5</VersionPrefix>
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
<TargetFramework>netstandard1.3</TargetFramework>
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>

2
src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj
View file

@ -3,7 +3,7 @@
<PropertyGroup>
<Description>SLN file reader/writer</Description>
<VersionPrefix>1.0.0-preview5</VersionPrefix>
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
<TargetFramework>netstandard1.6</TargetFramework>
<DebugType>portable</DebugType>
<AssemblyName>Microsoft.DotNet.Cli.Sln.Internal</AssemblyName>

2
src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs
View file

@ -21,7 +21,7 @@ namespace Microsoft.DotNet.Cli.Utils
public DepsJsonBuilder()
{
// This resolver is only used for building file names, so that base path is not required.
_versionFolderPathResolver = new VersionFolderPathResolver(path: null);
_versionFolderPathResolver = new VersionFolderPathResolver(rootPath: null);
}
public DependencyContext Build(

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

@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<VersionPrefix>1.0.0-preview5</VersionPrefix>
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
<TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
<WarningsAsErrors>true</WarningsAsErrors>
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>

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

@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<VersionPrefix>1.0.0-rc3</VersionPrefix>
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
<TargetFramework>netstandard1.5</TargetFramework>
<WarningsAsErrors>true</WarningsAsErrors>
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>

2
src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/PackageDependencyProvider.cs
View file

@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Resolution
_packagePathResolver = new FallbackPackagePathResolver(nugetPathContext);
// This resolver is only used for building file names, so that base path is not required.
_versionFolderPathResolver = new VersionFolderPathResolver(path: null);
_versionFolderPathResolver = new VersionFolderPathResolver(rootPath: null);
}
_frameworkReferenceResolver = frameworkReferenceResolver;

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

@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<VersionPrefix>1.0.0-preview5</VersionPrefix>
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework>
<WarningsAsErrors>true</WarningsAsErrors>
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>

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

@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Microsoft.DotNet.TestFramework Class Library</Description>
<VersionPrefix>1.0.0-preview5</VersionPrefix>
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
<TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>

2
src/dotnet/dotnet.csproj
View file

@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<VersionPrefix>1.0.0-preview5</VersionPrefix>
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework>
<AssemblyName>dotnet</AssemblyName>
<OutputType>Exe</OutputType>

2
src/redist/redist.csproj
View file

@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<VersionPrefix>1.0.0-preview5</VersionPrefix>
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dotnet5.4</PackageTargetFallback>

2
src/tool_msbuild/tool_msbuild.csproj
View file

@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<VersionPrefix>1.0.0-preview5</VersionPrefix>
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
src/tool_nuget/tool_nuget.csproj
View file

@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<VersionPrefix>1.0.0-preview5</VersionPrefix>
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
src/tool_roslyn/tool_roslyn.csproj
View file

@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.tasks" />
<PropertyGroup>
<VersionPrefix>1.0.0-preview5</VersionPrefix>
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
</PropertyGroup>