Merge pull request #641 from gpetrou/MSBuildSdkExtrasWorkaround

Remove MSBuildSdkExtras workarounds
Caliburn-Micro · Oct 7, 2019 · 8b0512e · 8b0512e
2 parents 2cebdf9 + ed06fe1
commit 8b0512e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 17 deletions.
diff --git a/azure-pipeline.yml b/azure-pipeline.yml
@@ -32,13 +32,6 @@ steps:
     msbuildArgs: '/t:Restore'
     configuration: '$(buildConfiguration)'
 
-- task: PowerShell@2
-# Workaround for https://github.com/onovotny/MSBuildSdkExtras/issues/174
-  displayName: 'Resource.Designer workaround'
-  inputs:
-    targetType: 'inline'
-    script: 'New-Item -ItemType File -Path .\src\Caliburn.Micro.Core\obj\Release\MonoAndroid80\Resource.Designer.cs -Force'
-
 - task: VSBuild@1
   displayName: Build & Pack Core Solution
   inputs:

diff --git a/src/Caliburn.Micro.Core/Caliburn.Micro.Core.csproj b/src/Caliburn.Micro.Core/Caliburn.Micro.Core.csproj
@@ -7,11 +7,6 @@
     <RootNamespace>Caliburn.Micro</RootNamespace>
   </PropertyGroup>
 
-  <!-- Workaround for https://github.com/onovotny/MSBuildSdkExtras/issues/173 -->
-  <PropertyGroup Label="Android DesignTimeBuild error workaround">
-    <DesignTimeBuild>false</DesignTimeBuild>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
     <AssemblyOriginatorKeyFile>.\..\Caliburn.Micro.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

diff --git a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj
@@ -7,11 +7,6 @@
     <RootNamespace>Caliburn.Micro</RootNamespace>
   </PropertyGroup>
 
-  <!-- Workaround for https://github.com/onovotny/MSBuildSdkExtras/issues/173 -->
-  <PropertyGroup Label="Android DesignTimeBuild error workaround">
-    <DesignTimeBuild>false</DesignTimeBuild>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'Xamarin.iOS10' or '$(TargetFramework)' == 'MonoAndroid80'">
     <DefineConstants>XFORMS</DefineConstants>
   </PropertyGroup>