Skip to content

Commit ed06fe1

Browse files
committed
Remove MSBuildSdkExtras workarounds
1 parent 2cebdf9 commit ed06fe1

File tree

3 files changed

+0
-17
lines changed

3 files changed

+0
-17
lines changed

azure-pipeline.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@ steps:
3232
msbuildArgs: '/t:Restore'
3333
configuration: '$(buildConfiguration)'
3434

35-
- task: PowerShell@2
36-
# Workaround for https://github.com/onovotny/MSBuildSdkExtras/issues/174
37-
displayName: 'Resource.Designer workaround'
38-
inputs:
39-
targetType: 'inline'
40-
script: 'New-Item -ItemType File -Path .\src\Caliburn.Micro.Core\obj\Release\MonoAndroid80\Resource.Designer.cs -Force'
41-
4235
- task: VSBuild@1
4336
displayName: Build & Pack Core Solution
4437
inputs:

src/Caliburn.Micro.Core/Caliburn.Micro.Core.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
<RootNamespace>Caliburn.Micro</RootNamespace>
88
</PropertyGroup>
99

10-
<!-- Workaround for https://github.com/onovotny/MSBuildSdkExtras/issues/173 -->
11-
<PropertyGroup Label="Android DesignTimeBuild error workaround">
12-
<DesignTimeBuild>false</DesignTimeBuild>
13-
</PropertyGroup>
14-
1510
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
1611
<AssemblyOriginatorKeyFile>.\..\Caliburn.Micro.snk</AssemblyOriginatorKeyFile>
1712
<SignAssembly>true</SignAssembly>

src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
<RootNamespace>Caliburn.Micro</RootNamespace>
88
</PropertyGroup>
99

10-
<!-- Workaround for https://github.com/onovotny/MSBuildSdkExtras/issues/173 -->
11-
<PropertyGroup Label="Android DesignTimeBuild error workaround">
12-
<DesignTimeBuild>false</DesignTimeBuild>
13-
</PropertyGroup>
14-
1510
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'Xamarin.iOS10' or '$(TargetFramework)' == 'MonoAndroid80'">
1611
<DefineConstants>XFORMS</DefineConstants>
1712
</PropertyGroup>

0 commit comments

Comments
 (0)