Update to Unified Build controls (#4486)

diff --git a/eng/Versions.props b/eng/Versions.props
index d6a887cde577208908d426701a02068dd2feeaea..b983e404b8c3a40f8ebf31ad8fb6dc2f2bfe98fa 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -80,7 +80,7 @@
     -->
     <MicrosoftCodeAnalysisVersion_4_4>4.4.0</MicrosoftCodeAnalysisVersion_4_4>
     <MicrosoftCodeAnalysisVersion_LatestVS>4.4.0</MicrosoftCodeAnalysisVersion_LatestVS>
-    <MicrosoftCodeAnalysisVersion_LatestVS Condition="'$(DotNetBuildFromSource)' == 'true'">$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVersion_LatestVS>
+    <MicrosoftCodeAnalysisVersion_LatestVS Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVersion_LatestVS>
     <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23420.2</MicrosoftCodeAnalysisAnalyzersVersion>
     <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23420.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <!--

diff --git a/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj b/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj
index 9610ae5dc75e1ab2804d0bd9302dc7992076d6e8..c64b60cfe78dd1791fc88df7113b0dc78ff66b8e 100644 (file)
--- a/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj
+++ b/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Condition="'$(DotNetBuildFromSource)' != 'true'" Project="$(RepositoryEngineeringDir)Analyzers.props" />
+  <Import Condition="'$(DotNetBuildSourceOnly)' != 'true'" Project="$(RepositoryEngineeringDir)Analyzers.props" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index c901bc12d0b2a946e6ce9b717d00af855df90206..08dabceea2d638e3524adaab3fcacae1370497cc 100644 (file)
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -27,6 +27,6 @@
   </PropertyGroup>
 
   <Import Project="$(RepositoryEngineeringDir)native\naming.props" />
-  <Import Condition="'$(DotNetBuildFromSource)' != 'true'"
+  <Import Condition="'$(DotNetBuildSourceOnly)' != 'true'"
           Project="$(RepositoryEngineeringDir)Analyzers.props" />
 </Project>

diff --git a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
index c4fe96c3e8a09cb1e887454a76b55f0a8aec3bda..9821004b12f5f8fd3ff8ec7e85ab003c94ef5343 100644 (file)
--- a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
+++ b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' != 'true'">netstandard2.0;net6.0</TargetFrameworks>
-    <TargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">netstandard2.0</TargetFramework>
+    <TargetFrameworks Condition="'$(DotNetBuildSourceOnly)' != 'true'">netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true'">netstandard2.0</TargetFramework>
     <RootNamespace>Microsoft.Diagnostics.NETCore.Client</RootNamespace>
     <Description>.NET Core Diagnostics Client Library</Description>
     <VersionPrefix>0.2.0</VersionPrefix>