Support using the Microsoft.NET.Sdk with dotnet/buildtools #2068

eerhardt · 2018-06-14T22:59:45Z

Don't import Microsoft.$(Language).targets in buildtools - the SDK will do that.
Use the Sdk's GenerateAssemblyInfo target when possible

Still support non-SDK projects for backwards compatiblity.

Note: I removed support for @(AssemblyInfoSource) during GenerateAssemblyInfo because it is no longer used as of dotnet/corefx/pull/30400.

- Don't import Microsoft.$(Language).targets in buildtools - the SDK will do that. - Use the Sdk's GenerateAssemblyInfo target when possible Still support non-SDK projects for backwards compatiblity. Note: I removed support for @(AssemblyInfoSource) during GenerateAssemblyInfo because it is no longer used as of dotnet/corefx/pull/30400.

src/Microsoft.DotNet.Build.Tasks/PackageFiles/FrameworkTargeting.targets


  <Import Project="$(CSharpTargetsFile)"
-          Condition="'$(TargetFrameworkIdentifier)' != '.NETPortable' and '$(MSBuildProjectExtension)' == '.csproj'" />
+          Condition="'$(TargetFrameworkIdentifier)' != '.NETPortable' and '$(MSBuildProjectExtension)' == '.csproj' and '$(UsingMicrosoftNETSdk)' != 'true'" />


src/Microsoft.DotNet.Build.Tasks/PackageFiles/versioning.targets

  <Target Name="DecideIfWeNeedToIncludeDllSafeSearchPathAttribute" 
-    Condition="'$(IsDotNetFrameworkProductAssembly)' == 'true' AND '$(IsTestProject)' != 'true'"
-    BeforeTargets="GenerateAssemblyInfo">
+    Condition="'$(IsDotNetFrameworkProductAssembly)' == 'true' AND '$(IsTestProject)' != 'true'">


safern

LGTM.

src/Microsoft.DotNet.Build.Tasks/PackageFiles/FrameworkTargeting.targets

          Condition="'$(MSBuildProjectExtension)' == '.depproj'" />

  <Import Project="IL.targets"
-           Condition="'$(MSBuildProjectExtension)' == '.ilproj' AND '$(SkipImportILTargets)'!='true'" />


src/Microsoft.DotNet.Build.Tasks/PackageFiles/GenerateAssemblyInfo.Sdk.targets

+    in order to get all the version properties set correctly.
+    So overwrite these two properties here, so they are set correctly.
+    -->
+    <Company>Microsoft Corporation</Company>


src/Microsoft.DotNet.Build.Tasks/PackageFiles/GenerateAssemblyInfo.Sdk.targets

+          DependsOnTargets="CreateVersionFileDuringBuild;DecideIfWeNeedToIncludeDllSafeSearchPathAttribute"
+          BeforeTargets="GetAssemblyAttributes">
+    <ItemGroup>
+      <AssemblyAttribute Include="System.Reflection.AssemblyDefaultAliasAttribute">


weshaggard

Just a few questions but overall looks reasonable.

eerhardt requested review from joperezr, safern and weshaggard June 14, 2018 22:59

joperezr reviewed Jun 15, 2018

View reviewed changes

safern approved these changes Jun 15, 2018

View reviewed changes

weshaggard reviewed Jun 15, 2018

View reviewed changes

weshaggard approved these changes Jun 15, 2018

View reviewed changes

joperezr approved these changes Jun 15, 2018

View reviewed changes

eerhardt merged commit 5254ae0 into dotnet:master Jun 15, 2018

eerhardt deleted the SdkSupport branch June 15, 2018 21:32

Support using the Microsoft.NET.Sdk with dotnet/buildtools #2068

Support using the Microsoft.NET.Sdk with dotnet/buildtools #2068

Uh oh!

Conversation

eerhardt commented Jun 14, 2018

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

safern left a comment

Choose a reason for hiding this comment

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

weshaggard left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants