From 8d2dfd94a62f85a6d5538e751783c5f09726e095 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Fri, 13 Nov 2020 10:52:40 -0800
Subject: [PATCH] Shorten package version properties (dotnet/aspnetcore#27784)

* Shorten package version properties
- `$(...PackageVersion)` -> `$(...Version)`
- inspired by a similar dotnet/efcore change
- aligns names with Arcade SDK, meaning our values apply consistently

* Remove unused PublishSymbols.proj and related property
- restore Arcade's control of `$(MicrosoftSymbolUploaderBuildTaskVersion>)`
- would otherwise result in a version downgrade

* Update `$(MicrosoftNetCompilersToolsetVersion)` to match Arcade's value
- avoid using an older toolset
- now successfully overriding Arcade value

* Avoid an odd `CS8603` error
- delete the unused `GetOptionalProperty(...)` method

* Correct an unintentional change reading package metadata
- `%(ReferencePathWithRefAssemblies.NuGetPackageVersion)` is the correct name

Commit migrated from dotnet/aspnetcore@44c0e6651e38
---
 .../integrationtests/MSBuildIntegrationTestBase.cs          | 2 +-
 .../Microsoft.NET.Sdk.Razor.IntegrationTests.csproj         | 6 +++---
 src/test/testassets/Directory.Build.props                   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Microsoft.NET.Sdk.Razor/integrationtests/MSBuildIntegrationTestBase.cs b/src/Microsoft.NET.Sdk.Razor/integrationtests/MSBuildIntegrationTestBase.cs
index cc9fd1009..e1106f6df 100644
--- a/src/Microsoft.NET.Sdk.Razor/integrationtests/MSBuildIntegrationTestBase.cs
+++ b/src/Microsoft.NET.Sdk.Razor/integrationtests/MSBuildIntegrationTestBase.cs
@@ -74,7 +74,7 @@ internal Task<MSBuildResult> DotnetMSBuild(
                 "/p:RunningAsTest=true",
 
                 $"/p:MicrosoftNETCoreAppRuntimeVersion={BuildVariables.MicrosoftNETCoreAppRuntimeVersion}",
-                $"/p:MicrosoftNetCompilersToolsetPackageVersion={BuildVariables.MicrosoftNetCompilersToolsetPackageVersion}",
+                $"/p:MicrosoftNetCompilersToolsetVersion={BuildVariables.MicrosoftNetCompilersToolsetVersion}",
                 $"/p:RazorSdkDirectoryRoot={BuildVariables.RazorSdkDirectoryRoot}",
                 $"/p:RepoRoot={BuildVariables.RepoRoot}",
             };
diff --git a/src/Microsoft.NET.Sdk.Razor/integrationtests/Microsoft.NET.Sdk.Razor.IntegrationTests.csproj b/src/Microsoft.NET.Sdk.Razor/integrationtests/Microsoft.NET.Sdk.Razor.IntegrationTests.csproj
index a26b2c2cf..718c37315 100644
--- a/src/Microsoft.NET.Sdk.Razor/integrationtests/Microsoft.NET.Sdk.Razor.IntegrationTests.csproj
+++ b/src/Microsoft.NET.Sdk.Razor/integrationtests/Microsoft.NET.Sdk.Razor.IntegrationTests.csproj
@@ -55,9 +55,9 @@
   </Target>
 
   <Target Name="RestoreTestProjects" BeforeTargets="Restore;Build" Condition="'$(DotNetBuildFromSource)' != 'true'">
-    <MSBuild Projects="..\..\test\testassets\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);RepoRoot=$(RepoRoot)" />
-    <MSBuild Projects="..\..\test\testassets\PackageLibraryDirectDependency\PackageLibraryDirectDependency.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);RepoRoot=$(RepoRoot)" />
-    <MSBuild Projects="..\..\test\testassets\PackageLibraryTransitiveDependency\PackageLibraryTransitiveDependency.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);RepoRoot=$(RepoRoot)" />
+    <MSBuild Projects="..\..\test\testassets\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetVersion=$(MicrosoftNetCompilersToolsetVersion);RepoRoot=$(RepoRoot)" />
+    <MSBuild Projects="..\..\test\testassets\PackageLibraryDirectDependency\PackageLibraryDirectDependency.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetVersion=$(MicrosoftNetCompilersToolsetVersion);RepoRoot=$(RepoRoot)" />
+    <MSBuild Projects="..\..\test\testassets\PackageLibraryTransitiveDependency\PackageLibraryTransitiveDependency.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetVersion=$(MicrosoftNetCompilersToolsetVersion);RepoRoot=$(RepoRoot)" />
   </Target>
 
   <Target Name="EnsureLogFolder" AfterTargets="Build">
diff --git a/src/test/testassets/Directory.Build.props b/src/test/testassets/Directory.Build.props
index c731613fd..bd7edf6bf 100644
--- a/src/test/testassets/Directory.Build.props
+++ b/src/test/testassets/Directory.Build.props
@@ -7,7 +7,7 @@
       We'll fall back to whatever the current SDK provides in regards to Roslyn's Microsoft.Net.Compilers.Toolset.
     -->
     <BuildingTestAppsIndependently>false</BuildingTestAppsIndependently>
-    <BuildingTestAppsIndependently Condition="'$(MicrosoftNetCompilersToolsetPackageVersion)' == ''">true</BuildingTestAppsIndependently>
+    <BuildingTestAppsIndependently Condition="'$(MicrosoftNetCompilersToolsetVersion)' == ''">true</BuildingTestAppsIndependently>
 
     <!-- Do not resolve Reference ItemGroup since it has a different semantic meaning in Razor test apps -->
     <EnableCustomReferenceResolution>false</EnableCustomReferenceResolution>
@@ -43,7 +43,7 @@
   </ItemGroup>
   <ItemGroup Condition="$(BuildingTestAppsIndependently) == 'false'">
     <PackageReference Include="Microsoft.Net.Compilers.Toolset"
-        Version="$(MicrosoftNetCompilersToolsetPackageVersion)"
+        Version="$(MicrosoftNetCompilersToolsetVersion)"
         PrivateAssets="all"
         IsImplicitlyDefined="true" />
   </ItemGroup>