Skip to content

Commit

Permalink
Rename private var
Browse files Browse the repository at this point in the history
  • Loading branch information
Oren Novotny committed Jul 29, 2018
1 parent cd7f59c commit d9b1c74
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Source/MSBuild.Sdk.Extras/Build/Core.props
Expand Up @@ -39,11 +39,11 @@
else Give 1.0 version since that property doesn't exist in 1.x Sdks
-->
<PropertyGroup>
<_NETCoreSdkVersion>$(NETCoreSdkVersion)</_NETCoreSdkVersion>
<_SdkNETCoreSdkVersion>$(NETCoreSdkVersion)</_SdkNETCoreSdkVersion>
<!-- Handle SemVer version like 2.1.300-preview, since MSBuild doesn't compare versions with alpha-numeric chars! -->
<_NETCoreSdkVersion Condition="$(_NETCoreSdkVersion.Contains('-'))">$(_NETCoreSdkVersion.Split('-')[0])</_NETCoreSdkVersion>
<_NETCoreSdkVersion Condition="'$(_NETCoreSdkVersion)' == ''">$(BundledNETCoreAppTargetFrameworkVersion)</_NETCoreSdkVersion>
<_NETCoreSdkVersion Condition="'$(_NETCoreSdkVersion)' == ''">1.0</_NETCoreSdkVersion>
<_SdkNETCoreSdkVersion Condition="$(_SdkNETCoreSdkVersion.Contains('-'))">$(_SdkNETCoreSdkVersion.Split('-')[0])</_SdkNETCoreSdkVersion>
<_SdkNETCoreSdkVersion Condition="'$(_SdkNETCoreSdkVersion)' == ''">$(BundledNETCoreAppTargetFrameworkVersion)</_SdkNETCoreSdkVersion>
<_SdkNETCoreSdkVersion Condition="'$(_SdkNETCoreSdkVersion)' == ''">1.0</_SdkNETCoreSdkVersion>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/MSBuild.Sdk.Extras/Build/RIDs.targets
Expand Up @@ -144,7 +144,7 @@
</PropertyGroup>

<MSBuild
Projects="$(MSBuildProjectFullPath)" Condition="'$([System.Version]::Parse($(_NETCoreSdkVersion)))' >= '$([System.Version]::Parse($(_SdkMinVersionWithDependencyTarget)))' "
Projects="$(MSBuildProjectFullPath)" Condition="'$([System.Version]::Parse($(_SdkNETCoreSdkVersion)))' >= '$([System.Version]::Parse($(_SdkMinVersionWithDependencyTarget)))' "
Targets="_GetFrameworksWithSuppressedDependencies"
Properties="TargetFramework=%(_TargetFrameworks.Identity);
BuildProjectReferences=false;">
Expand Down
6 changes: 3 additions & 3 deletions Source/MSBuild.Sdk.Extras/Build/Workarounds.targets
Expand Up @@ -101,7 +101,7 @@
-->
<Target Name="_SatelliteDeploymentOldSdkWorkaround"
AfterTargets="ResolveLockFileCopyLocalProjectDeps"
Condition="'$(_NETCoreSdkVersion)' &lt; '2.0' AND '$(IsMultiTargetingBuild)' != 'true'">
Condition="'$(_SdkNETCoreSdkVersion)' &lt; '2.0' AND '$(IsMultiTargetingBuild)' != 'true'">
<ItemGroup>
<ReferenceCopyLocalPaths Remove="@(ResourceCopyLocalItems)"/>
<ReferenceCopyLocalPaths Include="@(ResourceCopyLocalItems)" Condition="'@(ResourceCopyLocalItems)' != ''">
Expand All @@ -111,13 +111,13 @@
</Target>

<!-- By default we ignore the old sdk warning, if the user has loaded v4.3.0+ NuGet 'Pack' target, which contain some fixes around PRI files. -->
<PropertyGroup Condition="'$(_NETCoreSdkVersion)' &lt; '2.0'">
<PropertyGroup Condition="'$(_SdkNETCoreSdkVersion)' &lt; '2.0'">
<PackDependsOn>_WarnWhenUsingOldSdk;$(PackDependsOn)</PackDependsOn>
<ExtrasIgnoreOldSdkWarning Condition="'$(ExtrasIgnoreOldSdkWarning)' == '' AND '$(ImportNuGetBuildTasksPackTargetsFromSdk)' == 'false'">true</ExtrasIgnoreOldSdkWarning>
</PropertyGroup>

<!-- Check to see if we are on an Old SDK and warn the user about 'Pack' target! -->
<Target Name="_WarnWhenUsingOldSdk" Condition="'$(_NETCoreSdkVersion)' &lt; '2.0' AND '$(ExtrasIgnoreOldSdkWarning)' != 'true'">
<Target Name="_WarnWhenUsingOldSdk" Condition="'$(_SdkNETCoreSdkVersion)' &lt; '2.0' AND '$(ExtrasIgnoreOldSdkWarning)' != 'true'">
<Warning Text="There are known issues using the 'Pack' target that comes with the v1 SDKs. Update to v2 and above SDKs to use the fixed 'Pack' target. If you don't need the fixed 'Pack' target the set 'ExtrasIgnoreOldSdkWarning' property to 'true'. If you need to use the v1 SDKs and to use the 'Pack' target, then add a 'NuGet.Build.Tasks.Pack' v4.3.0 and above, as a dependency to proceed."/>
</Target>

Expand Down

0 comments on commit d9b1c74

Please sign in to comment.