Merge branch 'rel/1.0.0' into new_shared_framework_versions

build/Microsoft.DotNet.Cli.Compile.targets

@@ -115,7 +115,7 @@
     <DotNetPublish ToolPath="%(Stage.DotnetDir)"
                    Output="$(SdkOutputDirectory)"
                    Configuration="$(Configuration)"
-                   VersionSuffix="rc4-$(CommitCount)"
+                   VersionSuffix="$(VersionSuffix)"
                    ProjectPath="$(SrcDirectory)/redist/redist.csproj"
                    MSBuildArgs="/p:GenerateRuntimeConfigurationFiles=true" />
 
@@ -123,7 +123,7 @@
     <DotNetPublish ToolPath="%(Stage.DotnetDir)"
                    Output="$(SdkOutputDirectory)/Roslyn"
                    Configuration="$(Configuration)"
-                   VersionSuffix="rc4-$(CommitCount)"
+                   VersionSuffix="$(VersionSuffix)"
                    ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" />
 
       <!-- Corehostify Binaries -->

build/Microsoft.DotNet.Cli.Monikers.props

@@ -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 RC 4</SdkBrandName>
+    <SdkBrandName>Microsoft .NET Core 1.0.3 - SDK</SdkBrandName>
     <SharedFrameworkBrandName>Microsoft .NET Core 1.0.3 - Runtime</SharedFrameworkBrandName>
     <SharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</SharedHostBrandName>
     <HostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</HostFxrBrandName>

build/Microsoft.DotNet.Cli.Prepare.targets

@@ -58,7 +58,7 @@
       <Output TaskParameter="VersionMinor" PropertyName="VersionMinor" />
       <Output TaskParameter="VersionPatch" PropertyName="VersionPatch" />
       <Output TaskParameter="CommitCount" PropertyName="DefaultCommitCount" />
-      <Output TaskParameter="ReleaseSuffix" PropertyName="ReleaseSuffix" />
+      <Output TaskParameter="ReleaseSuffix" PropertyName="DefaultReleaseSuffix" />
       <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
       <Output TaskParameter="VersionBadgeMoniker" PropertyName="VersionBadgeMoniker" />
       <Output TaskParameter="Channel" PropertyName="Channel" />
@@ -67,17 +67,22 @@
 
     <PropertyGroup>
       <CommitCount Condition=" '$(CommitCount)' == '' ">$(DefaultCommitCount)</CommitCount>
+      <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">$(DefaultReleaseSuffix)</ReleaseSuffix>
 
-      <SimpleVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount)</SimpleVersion>
+      <SimpleVersion Condition=" '$(DropSuffix)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount)</SimpleVersion>
-      <VersionSuffix>$(ReleaseSuffix)-$(CommitCount)</VersionSuffix>
+      <SimpleVersion Condition=" '$(SimpleVersion)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch)</SimpleVersion>
-      <NugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(VersionSuffix)</NugetVersion>
+
+      <VersionSuffix Condition=" '$(DropSuffix)' == '' ">$(ReleaseSuffix)-$(CommitCount)</VersionSuffix>
+
+      <FullNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)-$(CommitCount)</FullNugetVersion>
+
+      <NugetVersion Condition=" '$(DropSuffix)' == '' ">$(FullNugetVersion)</NugetVersion>
+      <NugetVersion Condition=" '$(NugetVersion)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch)</NugetVersion>
+
+      <SdkVersion>$(NugetVersion)</SdkVersion>
+      <SdkNugetVersion>$(NugetVersion)</SdkNugetVersion>
 
       <VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
-      <SdkVersion>$(NugetVersion)</SdkVersion>
-
-      <SdkNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount)</SdkNugetVersion>
-      <ProjectModelNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount)</ProjectModelNugetVersion>
-      <DependencyModelAndInternalAbstractionsNugetVersion>$(VersionMajor).$(VersionMinor).1-beta-$(CommitCount)</DependencyModelAndInternalAbstractionsNugetVersion>
 
       <ArchiveExtension Condition=" '$(OSName)' == 'win' ">.zip</ArchiveExtension>
       <ArchiveExtension Condition=" '$(OSName)' != 'win' ">.tar.gz</ArchiveExtension>

build/Microsoft.DotNet.Cli.Publish.targets

@@ -43,11 +43,12 @@
     <ItemGroup>
       <ForPublishing Include="@(GeneratedInstallers)" />
       <ForPublishing Include="%(GenerateArchivesInputsOutputs.Outputs)" />
+      <ForPublishing Include="$(PackagesDirectory)/Microsoft*.nupkg" Condition=" 'PUBLISH_NUPKG_TO_AZURE_BLOB' != '' " />
     </ItemGroup>
 
     <ItemGroup>
       <ForPublishing>
-        <RelativeBlobPath>$(Product)/$(NugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
+        <RelativeBlobPath>$(Product)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
       </ForPublishing>
     </ItemGroup>
   </Target>
@@ -62,7 +63,7 @@
       <SdkInstallerFileItemGroup Include="$(SdkInstallerFile)" />
     </ItemGroup>
     <PropertyGroup>
-      <SdkDebianUploadUrl>$(DotnetBlobRootUrl)/$(Product)/$(NugetVersion)/%(SdkInstallerFileItemGroup.Filename)%(SdkInstallerFileItemGroup.Extension)</SdkDebianUploadUrl>
+      <SdkDebianUploadUrl>$(DotnetBlobRootUrl)/$(Product)/$(FullNugetVersion)/%(SdkInstallerFileItemGroup.Filename)%(SdkInstallerFileItemGroup.Extension)</SdkDebianUploadUrl>
       <DebianUploadJsonFile>$(SdkDebianIntermediateDirectory)/package_upload.json</DebianUploadJsonFile>
       <DebianRevisionNumber>1</DebianRevisionNumber>
 
@@ -89,7 +90,7 @@
 
     <ItemGroup>
       <CliVersionBadgeToUpload>
-        <RelativeBlobPath>$(Product)/$(NugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
+        <RelativeBlobPath>$(Product)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
       </CliVersionBadgeToUpload>
     </ItemGroup>
 

build/Microsoft.DotNet.Cli.Test.targets

@@ -59,7 +59,6 @@
           DependsOnTargets="Init;
                             SetupTestProjectData">
     <PropertyGroup>
-      <TestPackageBuildVersionSuffix>$(CommitCount)</TestPackageBuildVersionSuffix>
       <TestOutputDir>$(RepoRoot)/artifacts/testpackages/</TestOutputDir>
       <TestPackagesBuildDir>$(TestOutputDir)/packagesBuild/</TestPackagesBuildDir>
       <TestPackagesDir>$(TestOutputDir)/packages/</TestPackagesDir>

build/package/Microsoft.DotNet.Cli.Installer.MSI.targets

@@ -23,7 +23,7 @@
         <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
         <CombinedFrameworkSdkHostInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostInstallerFile>
         <SdkInstallerNuspecFile>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec</SdkInstallerNuspecFile>
-        <SdkInstallerNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(NugetVersion).nupkg</SdkInstallerNupkgFile>
+        <SdkInstallerNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</SdkInstallerNupkgFile>
       </PropertyGroup>
 
       <!-- Generate SDK MSI Inputs -->
@@ -134,7 +134,7 @@
 
       <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
                       '$(CombinedFrameworkSdkHostInstallerFile)'
-                      '$(NugetVersion)'
+                      '$(FullNugetVersion)'
                       '$(SdkInstallerNuspecFile)'
                       '$(SdkInstallerNupkgFile)'" />
     </Target>

build/package/Microsoft.DotNet.Cli.Nupkg.targets

@@ -4,7 +4,6 @@
   <Target Name="SetupProjectsToPack"
           DependsOnTargets="Init">
     <PropertyGroup>
-      <NupkgVersionSuffix>$(CommitCount)</NupkgVersionSuffix>
       <ProjectsSrcDirectory>$(RepoRoot)/src</ProjectsSrcDirectory>
       <PackagingBuildBasePath>$(Stage2CompilationDirectory)/forPackaging</PackagingBuildBasePath>
       <NupkgOutputDirectory>$(PackagesDirectory)</NupkgOutputDirectory>
@@ -26,7 +25,7 @@
                 Output="$(NupkgOutputDirectory)"
                 ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj"
                 ToolPath="$(Stage0Directory)"
-                VersionSuffix="rc4-$(NupkgVersionSuffix)"
+                VersionSuffix="$(VersionSuffix)"
                 Configuration="$(Configuration)" />
   </Target>
 

build/publish/FinishBuild.targets

@@ -8,7 +8,7 @@
     <CheckIfAllBuildsHavePublished AccountKey="$(ArtifactCloudDropAccessToken)"
                                    AccountName="$(ArtifactCloudDropAccountName)"
                                    ContainerName="$(ArtifactContainerName)"
-                                   NugetVersion="$(NugetVersion)">
+                                   NugetVersion="$(FullNugetVersion)">
       <Output TaskParameter="HaveAllBuildsPublished" PropertyName="HaveAllBuildsPublished" />
     </CheckIfAllBuildsHavePublished>
   </Target>
@@ -18,14 +18,14 @@
     <CopyBlobsToLatest AccountName="$(ArtifactCloudDropAccountName)"
                        AccountKey="$(ArtifactCloudDropAccessToken)"
                        ContainerName="$(ArtifactContainerName)"
-                       NugetVersion="$(NugetVersion)"
+                       NugetVersion="$(FullNugetVersion)"
                        Channel="$(Channel)"
                        CommitHash="$(CommitHash)" />
 
     <CopyBlobsToLatest AccountName="$(ChecksumCloudDropAccountName)"
                        AccountKey="$(ChecksumCloudDropAccessToken)"
                        ContainerName="$(ChecksumContainerName)"
-                       NugetVersion="$(NugetVersion)"
+                       NugetVersion="$(FullNugetVersion)"
                        Channel="$(Channel)"
                        CommitHash="$(CommitHash)" />
 

build/test/TestPackageProjects.targets

@@ -22,8 +22,8 @@
         <ProjectName>Microsoft.DotNet.Cli.Utils.csproj</ProjectName>
         <IsTool>True</IsTool>
         <IsApplicable>True</IsApplicable>
-        <VersionPrefix>$(CliVersionPrefix)-</VersionPrefix>
+        <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
-        <VersionSuffix>rc4-$(TestPackageBuildVersionSuffix)</VersionSuffix>
+        <VersionSuffix>$(VersionSuffix)</VersionSuffix>
         <Clean>False</Clean>
       </BaseTestPackageProject>
       <BaseTestPackageProject Include="src/Microsoft.DotNet.Cli.Utils"
@@ -32,8 +32,8 @@
         <ProjectName>Microsoft.DotNet.Cli.Utils.csproj</ProjectName>
         <IsTool>True</IsTool>
         <IsApplicable>True</IsApplicable>
-        <VersionPrefix>$(CliVersionPrefix)-</VersionPrefix>
+        <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
-        <VersionSuffix>rc4-$(TestPackageBuildVersionSuffix)</VersionSuffix>
+        <VersionSuffix>$(VersionSuffix)</VersionSuffix>
         <Clean>False</Clean>
         <MsbuildArgs>/p:TargetFramework=netstandard1.5</MsbuildArgs>
       </BaseTestPackageProject>
@@ -42,8 +42,8 @@
         <ProjectName>Microsoft.DotNet.InternalAbstractions.csproj</ProjectName>
         <IsTool>True</IsTool>
         <IsApplicable>True</IsApplicable>
-        <VersionPrefix>2.0.0-beta-</VersionPrefix>
+        <VersionPrefix>2.0.0</VersionPrefix>
-        <VersionSuffix>beta-$(TestPackageBuildVersionSuffix)</VersionSuffix>
+        <VersionSuffix>$(VersionSuffix)</VersionSuffix>
         <Clean>False</Clean>
       </BaseTestPackageProject>
       <BaseTestPackageProject Include="TestAssets/TestPackages/PackageWithFakeNativeDep"
@@ -62,8 +62,8 @@
         <ProjectName>dotnet-dependency-context-test.csproj</ProjectName>
         <IsTool>True</IsTool>
         <IsApplicable>True</IsApplicable>
-        <VersionPrefix>1.0.0-rc-</VersionPrefix>
+        <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
-        <VersionSuffix>rc-$(TestPackageBuildVersionSuffix)</VersionSuffix>
+        <VersionSuffix>$(VersionSuffix)</VersionSuffix>
         <Clean>True</Clean>
       </BaseTestPackageProject>
       <BaseTestPackageProject Include="TestAssets/TestPackages/dotnet-dependency-tool-invoker">
@@ -71,8 +71,8 @@
         <ProjectName>dotnet-dependency-tool-invoker.csproj</ProjectName>
         <IsTool>True</IsTool>
         <IsApplicable>True</IsApplicable>
-        <VersionPrefix>1.0.0-rc-</VersionPrefix>
+        <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
-        <VersionSuffix>rc-$(TestPackageBuildVersionSuffix)</VersionSuffix>
+        <VersionSuffix>$(VersionSuffix)</VersionSuffix>
         <Clean>True</Clean>
       </BaseTestPackageProject>
       <BaseTestPackageProject Include="TestAssets/TestPackages/dotnet-desktop-and-portable"
@@ -81,8 +81,8 @@
         <ProjectName>dotnet-desktop-and-portable.csproj</ProjectName>
         <IsTool>True</IsTool>
         <IsApplicable>True</IsApplicable>
-        <VersionPrefix>1.0.0-rc-</VersionPrefix>
+        <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
-        <VersionSuffix>rc-$(TestPackageBuildVersionSuffix)</VersionSuffix>
+        <VersionSuffix>$(VersionSuffix)</VersionSuffix>
         <Clean>True</Clean>
         <MsbuildArgs>/p:RuntimeIdentifier=$(CoreCLRRid)</MsbuildArgs>
       </BaseTestPackageProject>
@@ -93,8 +93,8 @@
         <IsTool>True</IsTool>
         <IsMsbuild>True</IsMsbuild>
         <IsApplicable>$(DesktopAvailable)</IsApplicable>
-        <VersionPrefix>1.0.0-rc-</VersionPrefix>
+        <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
-        <VersionSuffix>rc-$(TestPackageBuildVersionSuffix)</VersionSuffix>
+        <VersionSuffix>$(VersionSuffix)</VersionSuffix>
         <Clean>True</Clean>
         <MsbuildArgs>/p:RuntimeIdentifier=$(CoreCLRRid)</MsbuildArgs>
       </BaseTestPackageProject>

build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs

@@ -27,15 +27,6 @@ namespace Microsoft.DotNet.Cli.Build
         [Output]
         public string ReleaseSuffix { get; set; }
 
-        [Output]
-        public string VersionSuffix { get; set; }
-
-        [Output]
-        public string SimpleVersion { get; set; }
-
-        [Output]
-        public string NugetVersion { get; set; }
-
         [Output]
         public string MsiVersion { get; set; }
 
@@ -56,7 +47,7 @@ namespace Microsoft.DotNet.Cli.Build
 
             var branchInfo = new BranchInfo(RepoRoot);
 
-            var buildVersion = new BuildVersion()
+            var buildVersion = new Version
             {
                 Major = int.Parse(branchInfo.Entries["MAJOR_VERSION"]),
                 Minor = int.Parse(branchInfo.Entries["MINOR_VERSION"]),
@@ -70,9 +61,6 @@ namespace Microsoft.DotNet.Cli.Build
             VersionPatch = buildVersion.Patch;
             CommitCount = buildVersion.CommitCountString;
             ReleaseSuffix = buildVersion.ReleaseSuffix;
-            VersionSuffix = buildVersion.VersionSuffix;
-            SimpleVersion = buildVersion.SimpleVersion;
-            NugetVersion = buildVersion.NuGetVersion;
             MsiVersion = buildVersion.GenerateMsiVersion();
             VersionBadgeMoniker = Monikers.GetBadgeMoniker();
             Channel = branchInfo.Entries["CHANNEL"];

build_projects/shared-build-targets-utils/Utils/BuildVersion.cs

@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-
-namespace Microsoft.DotNet.Cli.Build
-{
-    public class BuildVersion : Version
-    {
-        public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}";
-        public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";
-        public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}";
-        public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc4-{CommitCountString}";
-        public string ProductionVersion => $"{Major}.{Minor}.{Patch}";
-    }
-}

build_projects/shared-build-targets-utils/Utils/Version.cs

@@ -1,8 +1,6 @@
-using System.Collections.Generic;
-
 namespace Microsoft.DotNet.Cli.Build
 {
-    public abstract class Version
+    public class Version
     {
         public virtual int Major { get; set; }
         public virtual int Minor { get; set; }

scripts/dockerrun.sh

@@ -134,5 +134,7 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \
     -e CHECKSUM_STORAGE_CONTAINER \
     -e CLIBUILD_SKIP_TESTS \
     -e CommitCount \
+    -e DropSuffix \
+    -e ReleaseSuffix \
     $DOTNET_BUILD_CONTAINER_TAG \
     $BUILD_COMMAND "$@"

src/Microsoft.DotNet.ProjectJsonMigration/ConstantPackageVersions.cs

@@ -5,8 +5,8 @@ namespace Microsoft.DotNet.ProjectJsonMigration
 {
     internal class ConstantPackageVersions
     {
-        public const string AspNetToolsVersion = "1.0.0-msbuild3-final";
+        public const string AspNetToolsVersion = "1.0.0";
-        public const string AspNet110ToolsVersion = "1.1.0-msbuild3-final";
+        public const string AspNet110ToolsVersion = "1.1.0";
         public const string AspNetLTSPackagesVersion = "1.0.2";
         public const string EntityFrameworkLTSPackagesVersion = "1.0.2";
         public const string TestSdkPackageVersion = "15.0.0-preview-20170106-08";
@@ -15,6 +15,5 @@ namespace Microsoft.DotNet.ProjectJsonMigration
         public const string MstestTestAdapterVersion = "1.1.8-rc";
         public const string MstestTestFrameworkVersion = "1.0.8-rc";
         public const string BundleMinifierToolVersion = "2.2.301";
-        public const string WebSdkPackageVersion = "1.0.0-alpha-20161205-1-154" ;
     }
 }

src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs

@@ -53,6 +53,17 @@ namespace Microsoft.DotNet.ProjectJsonMigration
                         Version = ConstantPackageVersions.AspNetToolsVersion
                     }
                 },
+                {
+                    new PackageDependencyInfo
+                    {
+                        Name = "Microsoft.EntityFrameworkCore.Tools.DotNet",
+                        Version = "[1.0.0-*,)"
+                    },
+                    new PackageDependencyInfo {
+                        Name = "Microsoft.EntityFrameworkCore.Tools.DotNet",
+                        Version = ConstantPackageVersions.AspNetToolsVersion
+                    }
+                },
                 {
                     new PackageDependencyInfo
                     {

test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs

@@ -59,6 +59,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
         }
 
         [Theory]
+        [InlineData("Microsoft.EntityFrameworkCore.Tools.DotNet", "Microsoft.EntityFrameworkCore.Tools.DotNet", ConstantPackageVersions.AspNetToolsVersion)]
         [InlineData("Microsoft.EntityFrameworkCore.Tools", "Microsoft.EntityFrameworkCore.Tools.DotNet", ConstantPackageVersions.AspNetToolsVersion)]
         [InlineData("Microsoft.VisualStudio.Web.CodeGeneration.Tools", "Microsoft.VisualStudio.Web.CodeGeneration.Tools", ConstantPackageVersions.AspNetToolsVersion)]
         [InlineData("Microsoft.DotNet.Watcher.Tools", "Microsoft.DotNet.Watcher.Tools", ConstantPackageVersions.AspNetToolsVersion)]
@@ -90,5 +91,13 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 
             var packageRef = mockProj.Items.Where(i => i.ItemType == "DotNetCliToolReference").Should().BeEmpty();
         }
+
+        [Fact]
+        public void ItMergesEntityFrameworkCoreToolsAndEntityFrameworkCoreToolsDotNet()
+        {
+            var mockProj = RunPackageDependenciesRuleOnPj("{ \"tools\": { \"Microsoft.EntityFrameworkCore.Tools\": \"1.0.0-preview4-final\", \"Microsoft.EntityFrameworkCore.Tools.DotNet\": \"1.0.0-preview4-final\" } }");
+
+            EmitsToolReferences(mockProj, Tuple.Create("Microsoft.EntityFrameworkCore.Tools.DotNet", ConstantPackageVersions.AspNetToolsVersion));
+        }
     }
 }