use Sdks attribute in dotnet new templates (#4916)

* Move dotnet-new templates to Sdk attribute * Update to MSBuild 15.1.0-preview-000454-01 To pick up a fix for dotnet/msbuild#1431. * Fix template newlines * Fix casing on Microsoft.Net.Sdk * Move migration test csproj's to Sdk attribute * Disable parallel sdk restore Each SDK restore operation will try to manipulate the same assets.json file since the dependency name&version are injected into a common csproj file. This can cause runtime failures when two NuGets try to restore the project at once. * Make casing of SDK 'NET' and not 'Net' * Remove redundatn imports * Fix test string * Additional race * Replacing the SDK with the Web.Sdk when it is a Web project. * Fixing the test by writting the csproj before running the migration rule.
dotnet · Dec 5, 2016 · d6cab4a · d6cab4a
1 parent dc3d88c
commit d6cab4a
Show file tree

Hide file tree

Showing 30 changed files with 179 additions and 177 deletions.
diff --git a/TestAssets/TestProjects/MSBuildIntegration/build.props b/TestAssets/TestProjects/MSBuildIntegration/build.props
@@ -2,6 +2,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <ItemGroup>
-    <Sdk Include="Microsoft.Net.Sdk" Version="$(CLI_NETSDK_Version)" />
+    <Sdk Include="Microsoft.NET.Sdk" Version="$(CLI_NETSDK_Version)" />
   </ItemGroup>
 </Project>
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj
@@ -1,5 +1,4 @@
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
@@ -14,14 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>$(CLI_NETSDK_Version)</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="NETStandard.Library">
       <Version>1.6.0</Version>
     </PackageReference>
   </ItemGroup>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj
@@ -1,5 +1,4 @@
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
@@ -14,14 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>$(CLI_NETSDK_Version)</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="NETStandard.Library">
       <Version>1.6.0</Version>
     </PackageReference>
   </ItemGroup>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj
@@ -1,5 +1,4 @@
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
@@ -14,14 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>$(CLI_NETSDK_Version)</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="NETStandard.Library">
       <Version>1.6.0</Version>
     </PackageReference>
   </ItemGroup>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.proj b/build/Microsoft.DotNet.Cli.BundledSdks.proj
@@ -16,6 +16,9 @@
           Outputs="@(SdkContent->'$(SdkLayoutDirectory)/%(RecursiveDir)%(FileName)%(Extension)')">
     <Copy SourceFiles="@(SdkContent)"
           DestinationFiles="@(SdkContent->'$(SdkLayoutDirectory)/%(RecursiveDir)%(FileName)%(Extension)')" />
+
+    <Message Text="Copied Sdk $(SdkPackageName) from $(SdkNuPkgPath) to $(SdkLayoutDirectory)."
+             Importance="High" />
   </Target>
 
   <Target Name="GetSdkItemsToCopy">

diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.props b/build/Microsoft.DotNet.Cli.BundledSdks.props
@@ -4,7 +4,7 @@
   <ItemGroup>
     <!-- CLI cannot use the latest SDK until we move away from SDK PackageRef -->
     <BundledSdk Include="NuGet.Build.Tasks.Pack" Version="4.0.0-rc2" />
-    <BundledSdk Include="Microsoft.Net.Sdk" Version="1.0.0-alpha-20161203-1" />
+    <BundledSdk Include="Microsoft.NET.Sdk" Version="1.0.0-alpha-20161203-1" />
     <BundledSdk Include="Microsoft.NET.Sdk.Web" Version="$(CLI_WEBSDK_Version)" />
     <BundledSdk Include="Microsoft.NET.Sdk.Publish" Version="$(CLI_WEBSDK_Version)" />
     <BundledSdk Include="Microsoft.NET.Sdk.Web.ProjectSystem" Version="$(CLI_WEBSDK_Version)" />

diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets
@@ -251,7 +251,7 @@
         <Properties>
           CLIBuildDll=$(CLIBuildDll);
           NuGetPackagesDir=$(NuGetPackagesDir);
-          SdkLayoutDirectory=$(SdkOutputDirectory)/Extensions/%(BundledSdk.Identity);
+          SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity);
           SdkPackageName=%(BundledSdk.Identity);
           SdkPackageVersion=%(BundledSdk.Version);
           Stage0Directory=$(Stage0Directory)
@@ -260,7 +260,7 @@
     </ItemGroup>
 
     <MSBuild
-      BuildInParallel="True"
+      BuildInParallel="False"
       Projects="@(SdksToBundle)">
     </MSBuild>
   </Target>

diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.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>
-    <CLI_MSBuild_Version>15.1.0-preview-000451-02</CLI_MSBuild_Version>
+    <CLI_MSBuild_Version>15.1.0-preview-000454-01</CLI_MSBuild_Version>
     <CLI_NETSDK_Version>1.0.0-alpha-20161104-2</CLI_NETSDK_Version>
     <CLI_WEBSDK_Version>1.0.0-alpha-20161104-2-112</CLI_WEBSDK_Version>
   </PropertyGroup>

diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/ConstantPackageVersions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/ConstantPackageVersions.cs
@@ -12,5 +12,6 @@ internal class ConstantPackageVersions
         public const string MstestTestAdapterVersion = "1.1.3-preview";
         public const string MstestTestFrameworkVersion = "1.0.4-preview";
         public const string BundleMinifierToolVersion = "2.2.301";
+        public const string WebSdkPackageVersion = "1.0.0-alpha-20161117-1-119" ;
     }
 }
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/MigrationSettings.cs b/src/Microsoft.DotNet.ProjectJsonMigration/MigrationSettings.cs
@@ -13,30 +13,27 @@ internal class MigrationSettings
         public string ProjectXProjFilePath { get; }
         public string ProjectDirectory { get; }
         public string OutputDirectory { get; }
-        public string SdkPackageVersion { get; }
         public ProjectRootElement MSBuildProjectTemplate { get; }
         public string SdkDefaultsFilePath { get; }
 
         public MigrationSettings(
             string projectDirectory,
             string outputDirectory,
-            string sdkPackageVersion,
             ProjectRootElement msBuildProjectTemplate,
             string projectXprojFilePath=null,
             string sdkDefaultsFilePath=null) : this(
-                projectDirectory, outputDirectory, sdkPackageVersion, projectXprojFilePath, sdkDefaultsFilePath)
+                projectDirectory, outputDirectory, projectXprojFilePath, sdkDefaultsFilePath)
         {
             MSBuildProjectTemplate = msBuildProjectTemplate != null ? msBuildProjectTemplate.DeepClone() : null;
         }
 
         public MigrationSettings(
             string projectDirectory,
             string outputDirectory,
-            string sdkPackageVersion,
             string msBuildProjectTemplatePath,
             string projectXprojFilePath=null,
             string sdkDefaultsFilePath=null) : this(
-                projectDirectory, outputDirectory, sdkPackageVersion, projectXprojFilePath, sdkDefaultsFilePath)
+                projectDirectory, outputDirectory, projectXprojFilePath, sdkDefaultsFilePath)
         {
             _msBuildProjectTemplatePath = msBuildProjectTemplatePath;
             MSBuildProjectTemplate = ProjectRootElement.Open(
@@ -48,13 +45,11 @@ public MigrationSettings(
         private MigrationSettings(
             string projectDirectory,
             string outputDirectory,
-            string sdkPackageVersion,
             string projectXprojFilePath=null,
             string sdkDefaultsFilePath=null)
         {
             ProjectDirectory = projectDirectory;
             OutputDirectory = outputDirectory;
-            SdkPackageVersion = sdkPackageVersion;
             ProjectXProjFilePath = projectXprojFilePath;
             SdkDefaultsFilePath = sdkDefaultsFilePath;
         }

diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/ProjectMigrator.cs b/src/Microsoft.DotNet.ProjectJsonMigration/ProjectMigrator.cs
@@ -74,7 +74,6 @@ public MigrationReport Migrate(MigrationSettings rootSettings, bool skipProjectR
                 var projectDir = Path.GetDirectoryName(project.ProjectFilePath);
                 var settings = new MigrationSettings(projectDir,
                                                      projectDir,
-                                                     rootSettings.SdkPackageVersion,
                                                      tempMSBuildProjectTemplate);
                 MigrateProject(settings);
                 projectMigrationReports.Add(MigrateProject(settings));

diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs
@@ -39,16 +39,6 @@ public void Apply(MigrationSettings migrationSettings, MigrationRuleInputs migra
 
             var noFrameworkPackageReferenceItemGroup = migrationRuleInputs.OutputMSBuildProject.AddItemGroup();
 
-            // Inject Sdk dependency
-            _transformApplicator.Execute(
-                SdkPackageDependencyTransform.Transform(
-                    new PackageDependencyInfo
-                    {
-                        Name = PackageConstants.SdkPackageName,
-                        Version = migrationSettings.SdkPackageVersion,
-                        PrivateAssets = "All"
-                    }), noFrameworkPackageReferenceItemGroup, mergeExisting: false);
-
             AddProjectTypeSpecificDependencies(
                 migrationRuleInputs,
                 migrationSettings,
@@ -90,18 +80,6 @@ private void AddProjectTypeSpecificDependencies(
             var type = project.GetProjectType();
             switch (type)
             {
-                case ProjectType.Web:
-                    _transformApplicator.Execute(
-                        SdkPackageDependencyTransform.Transform(
-                            new PackageDependencyInfo
-                            {
-                                Name = PackageConstants.WebSdkPackageName,
-                                Version = migrationSettings.SdkPackageVersion,
-                                PrivateAssets = "All"
-                            }),
-                        noFrameworkPackageReferenceItemGroup,
-                        mergeExisting: false);
-                    break;
                 case ProjectType.Test:
                     _transformApplicator.Execute(
                         PackageDependencyInfoTransform().Transform(

diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateWebSdkRule.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateWebSdkRule.cs
@@ -0,0 +1,40 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+using Microsoft.Build.Construction;
+
+namespace Microsoft.DotNet.ProjectJsonMigration.Rules
+{
+    //HACK to workaround https://github.com/Microsoft/msbuild/issues/1429
+    internal class MigrateWebSdkRule : IMigrationRule
+    {
+        private static string GetContainingFolderName(string projectDirectory)
+        {
+            projectDirectory = projectDirectory.TrimEnd(new char[] { '/', '\\' });
+            return Path.GetFileName(projectDirectory);
+        }
+
+        public void Apply(MigrationSettings migrationSettings, MigrationRuleInputs migrationRuleInputs)
+        {
+            var project = migrationRuleInputs.DefaultProjectContext.ProjectFile;
+            var type = project.GetProjectType();
+
+            if(type == ProjectType.Web)
+            {
+                ReplaceSdkWithWebSdk(migrationSettings);
+            }
+        }
+
+        private void ReplaceSdkWithWebSdk(MigrationSettings migrationSettings)
+        {
+            string csprojName = $"{GetContainingFolderName(migrationSettings.ProjectDirectory)}.csproj";
+            var outputProject = Path.Combine(migrationSettings.OutputDirectory, csprojName);
+
+            var csprojContent = File.ReadAllText(outputProject);
+            csprojContent = csprojContent.Replace("Sdk=\"Microsoft.NET.Sdk\"", "Sdk=\"Microsoft.NET.Sdk.Web\"");
+
+            File.WriteAllText(outputProject, csprojContent);
+        }
+    }
+}
diff --git a/src/dotnet/commands/dotnet-migrate/MigrateCommand.cs b/src/dotnet/commands/dotnet-migrate/MigrateCommand.cs
@@ -59,10 +59,6 @@ public int Execute()
             var projectsToMigrate = GetProjectsToMigrate(_projectArg);
 
             var msBuildTemplatePath = _templateFile ?? temporaryDotnetNewProject.MSBuildProjectPath;
-
-            var sdkVersion = _sdkVersion ?? temporaryDotnetNewProject.MSBuildProject.GetSdkVersion();
-
-            EnsureNotNull(sdkVersion, "Null Sdk Version");
 
             MigrationReport migrationReport = null;
 
@@ -73,7 +69,6 @@ public int Execute()
                 var migrationSettings = new MigrationSettings(
                     projectDirectory,
                     outputDirectory,
-                    sdkVersion,
                     msBuildTemplatePath,
                     _xprojFilePath);
                 var projectMigrationReport = new ProjectMigrator().Migrate(migrationSettings, _skipProjectReferences);

diff --git a/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs b/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs
@@ -18,7 +18,7 @@ public class MSBuildForwardingApp
 
         private const string MSBuildExeName = "MSBuild.dll";
 
-        private const string ExtensionsDirectoryName = "Extensions";
+        private const string SdksDirectoryName = "Sdks";
 
         private readonly ForwardingApp _forwardingApp;
 
@@ -95,7 +95,7 @@ private static string GetMSBuildSDKsPath()
 
             return Path.Combine(
                 AppContext.BaseDirectory,
-                ExtensionsDirectoryName);
+                SdksDirectoryName);
         }
 
         private static string GetRunCscPath()

diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj
@@ -1,6 +1,5 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
-
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp1.0</TargetFramework>
@@ -12,14 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App">
-      <Version>1.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161104-2</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
   </ItemGroup>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
diff --git a/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj
@@ -1,5 +1,4 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
 
   <PropertyGroup>
     <TargetFramework>netstandard1.4</TargetFramework>
@@ -11,14 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NETStandard.Library">
-      <Version>1.6</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161104-2</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="NETStandard.Library" Version="1.6" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj
@@ -1,5 +1,4 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -12,23 +11,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App">
-      <Version>1.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161104-2</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk">
-      <Version>15.0.0-preview-20161123-03</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestAdapter">
-      <Version>1.1.5-preview</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestFramework">
-      <Version>1.0.6-preview</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.1.5-preview" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.0.6-preview" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>