housekeeping: Update MsBuild.Sdk.Extras to 2.0.43 (reactiveui#2167)

* Update global.json * Attempt fix * Further fix * One more attempt * further work * Remove hacky thing
InitialForce · Sep 17, 2019 · e6b043c · e6b043c
1 parent a342f88
commit e6b043c
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 37 deletions.
diff --git a/src/Directory.build.targets b/src/Directory.build.targets
@@ -3,6 +3,7 @@
 
   <PropertyGroup>  
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
+    <AndroidUseIntermediateDesignerFile>False</AndroidUseIntermediateDesignerFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">

diff --git a/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj b/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj
@@ -7,12 +7,6 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
-  <Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
-    <ItemGroup>
-      <Compile Remove="$(AndroidResgenFile)"/>
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
     <PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="27.0.*" />
     <PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.*" />

diff --git a/src/ReactiveUI.Events/ReactiveUI.Events.csproj b/src/ReactiveUI.Events/ReactiveUI.Events.csproj
@@ -9,12 +9,6 @@
     <NoWarn>$(NoWarn);CS1570;CA1812</NoWarn>
   </PropertyGroup>
 
-  <Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
-    <ItemGroup>
-      <Compile Remove="$(AndroidResgenFile)"/>
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
     <Compile Remove="*.cs" />
     <None Include="*.cs" />
@@ -23,6 +17,12 @@
   </ItemGroup>
 
   <ItemGroup Condition="  $(TargetFramework.StartsWith('uap')) ">
+    <SDKReference Include="WindowsDesktop, Version=10.0.16299.0">	
+      <Name>Windows Desktop Extensions for the UWP</Name>	
+    </SDKReference>	
+    <SDKReference Include="WindowsMobile, Version=10.0.16299.0"> 	
+      <Name>Windows Mobile Extensions for the UWP</Name> 	
+    </SDKReference> 
     <Compile Include="Events_uwp.cs" Condition="Exists('Events_uwp.cs')" />
   </ItemGroup>
 

diff --git a/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj b/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj
@@ -14,12 +14,6 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
-  <Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
-    <ItemGroup>
-      <Compile Remove="$(AndroidResgenFile)"/>
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
     <PackageReference Include="Fody" Version="6.0.0" PrivateAssets="None" />
     <PackageReference Include="FodyPackaging" Version="6.0.0" PrivateAssets="All" />

diff --git a/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj b/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj
@@ -9,12 +9,6 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
-  <Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
-    <ItemGroup>
-      <Compile Remove="$(AndroidResgenFile)"/>
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Reactive.Testing" Version="4.1.6" />
     <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />

diff --git a/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj b/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj
@@ -13,12 +13,6 @@
     <DefineConstants>HAS_UNO;WASM</DefineConstants>
   </PropertyGroup>
 
-  <Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
-    <ItemGroup>
-      <Compile Remove="$(AndroidResgenFile)"/>
-    </ItemGroup>
-  </Target>
-
   <ItemGroup Condition=" !$(TargetFramework.StartsWith('uap')) ">
     <PackageReference Include="Uno.UI" Version="1.*" />
   </ItemGroup>

diff --git a/src/ReactiveUI/ReactiveUI.csproj b/src/ReactiveUI/ReactiveUI.csproj
@@ -9,12 +9,6 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
-  <Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
-    <ItemGroup>
-      <Compile Remove="$(AndroidResgenFile)"/>
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
     <Compile Remove="Platforms\**\*.cs" />
     <None Include="Platforms\**\*.cs" />

diff --git a/src/global.json b/src/global.json
@@ -3,6 +3,6 @@
         "version": "3.0.100-preview"
     },
     "msbuild-sdks": {
-        "MSBuild.Sdk.Extras": "2.0.31"
+        "MSBuild.Sdk.Extras": "2.0.43"
     }
 }