Fix props imports (xamarin#10718)

* files * - remove version
fabulous-dev · May 16, 2020 · c93ea26 · c93ea26
1 parent ec66140
commit c93ea26
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 13 deletions.
diff --git a/Environment.Build.props b/Environment.Build.props
@@ -19,12 +19,21 @@
     -->
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(CI)' == 'true'">
+    <_XamarinFormsVersion>$(BUILD_BUILDNUMBER.Split(`+`)[0])</_XamarinFormsVersion>
+    <XamarinFormsVersion Condition="Exists('$(BUILD_SOURCESDIRECTORY)/Nuget/Xamarin.Forms.$(_XamarinFormsVersion).nupkg')" >$(_XamarinFormsVersion)</XamarinFormsVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <FromSource Condition="'$(XamarinFormsVersion)' != '' AND '$(FromSource)' == ''">false</FromSource>
+    <FromSource Condition="'$(FromSource)' == ''">true</FromSource>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildRuntimeType)' == 'Mono'">$(FrameworkSDKRoot.Contains('/Versions/5'))</Use2017>
     <Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildAssemblyVersion)' &lt; '16.0'">true</Use2017>
     <Use2017 Condition="'$(Use2017)' == ''">false</Use2017>
   </PropertyGroup>
-
   <!-- This is used by the libraries -->
   <PropertyGroup Condition="'$(AndroidTargetFrameworks)' == ''">
     <AndroidTargetFrameworks Condition="'$(Use2017)' == 'true'">MonoAndroid90;</AndroidTargetFrameworks>

diff --git a/SampleImports/Directory.Build.props b/SampleImports/Directory.Build.props
@@ -1,10 +1,9 @@
 <Project>
   <PropertyGroup>
-    <XamarinFormsSource>..\..\</XamarinFormsSource>
-    <FromSource Condition="'$(FromSource)' == ''">true</FromSource>
-    <XamarinFormsVersion>4.6.0.494-pre2</XamarinFormsVersion>
+    <XamarinFormsSource Condition="'$(XamarinFormsSource)' == ''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\'))</XamarinFormsSource>
+    <FromSource Condition="'$(FromSource)' == ''">true</FromSource>    
     <NoWarn>$(NoWarn);NU1605</NoWarn>
-    <SampleProject>true</SampleProject>
+    <SampleProject Condition="'$(SampleProject)' == ''">true</SampleProject>
   </PropertyGroup>
   <Import Project="..\Directory.Build.props" />
   <Import Project="Netstandard.Build.props" Condition=" $(TargetFramework.StartsWith('netstandard'))" />

diff --git a/SampleImports/Directory.Build.targets b/SampleImports/Directory.Build.targets
@@ -1,8 +1,8 @@
 <Project>
 
+  <Import Project="Nuget.Build.targets" Condition="'$(XamarinFormsVersion)' != ''" />
+
   <ItemGroup>
-    <PackageReference ExcludeAssets="All" Include="Xamarin.Forms" Version="$(XamarinFormsVersion)">
-    </PackageReference>
     <ProjectReference Include="$(XamarinFormsSource)Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
       <Name>Xamarin.Forms.Core</Name>
     </ProjectReference>

diff --git a/SampleImports/Netstandard.Build.props b/SampleImports/Netstandard.Build.props
@@ -1,4 +1,4 @@
 <Project>
-  <Import Project="..\.nuspec\Xamarin.Forms.props" />
-  <Import Project="..\Directory.Build.props" />
+  <Import Project="$(XamarinFormsSource).nuspec\Xamarin.Forms.props" />
+  <Import Project="$(XamarinFormsSource)Directory.Build.props" />
  </Project>
diff --git a/SampleImports/Netstandard.Build.targets b/SampleImports/Netstandard.Build.targets
@@ -1,13 +1,13 @@
 <Project>
-  <Import Project="..\.nuspec\Xamarin.Forms.DefaultItems.props" />
-  <Import Project="..\.nuspec\Xamarin.Forms.DefaultItems.targets" />
+  <Import Project="$(XamarinFormsSource).nuspec\Xamarin.Forms.DefaultItems.props" />
+  <Import Project="$(XamarinFormsSource).nuspec\Xamarin.Forms.DefaultItems.targets" />
   <PropertyGroup>
     <XFDisableTargetsValidation>True</XFDisableTargetsValidation>
   </PropertyGroup>
 
   <ItemGroup>
   </ItemGroup>
-  <Import Project="..\.nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND Exists('$(__XFBuildTasksLocation)Xamarin.Forms.Build.Tasks.dll')" />
-  <Import Project="..\.nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' != 'true'" />
+  <Import Project="$(XamarinFormsSource).nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND Exists('$(__XFBuildTasksLocation)Xamarin.Forms.Build.Tasks.dll')" />
+  <Import Project="$(XamarinFormsSource).nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' != 'true'" />
 
 </Project>
diff --git a/SampleImports/Nuget.Build.targets b/SampleImports/Nuget.Build.targets
@@ -0,0 +1,6 @@
+<Project>
+  <ItemGroup>
+    <PackageReference ExcludeAssets="All" Include="Xamarin.Forms" Version="$(XamarinFormsVersion)">
+    </PackageReference>
+  </ItemGroup>
+</Project>