Skip to content
Permalink
Browse files

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

* Update global.json

* Attempt fix

* Further fix

* One more attempt

* further work

* Remove hacky thing
  • Loading branch information...
glennawatson authored and RLittlesII committed Sep 17, 2019
1 parent a342f88 commit e6b043c65d9e9c215275437e1abd0830a4ca4142
@@ -3,6 +3,7 @@

<PropertyGroup>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<AndroidUseIntermediateDesignerFile>False</AndroidUseIntermediateDesignerFile>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
@@ -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.*" />
@@ -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>

@@ -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" />
@@ -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" />
@@ -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>
@@ -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" />
@@ -3,6 +3,6 @@
"version": "3.0.100-preview"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "2.0.31"
"MSBuild.Sdk.Extras": "2.0.43"
}
}

0 comments on commit e6b043c

Please sign in to comment.
You can’t perform that action at this time.