Skip to content

Commit 7eb9c0b

Browse files
authored
Merge pull request #3084 from windows-toolkit/mhawker/fix-vs2019-build
Fixes #3012 working around NuGet/Home#8388
2 parents cdc3a6a + 6b548da commit 7eb9c0b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@
4444
<PropertyGroup Condition="'$(TargetFramework)' == 'native'">
4545
<OutputType>winmdobj</OutputType>
4646
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
47-
<NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
47+
<!-- Workaround for issue NuGet/Home#8388; change behavior during NuGet restore time vs. final build to avoid NuGet conflict in VS 2019 -->
48+
<NugetTargetMoniker Condition="'$(DesignTimeBuild)' == 'true'">native</NugetTargetMoniker>
49+
<NugetTargetMoniker Condition="'$(DesignTimeBuild)' != 'true'">UAP,Version=v10.0</NugetTargetMoniker>
4850
<PackageTargetFallback>uap10.0</PackageTargetFallback>
4951
<TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
5052
<TargetPlatformMinVersion Condition="'$(TargetPlatformMinVersion)' == '' ">10.0.10240.0</TargetPlatformMinVersion>

0 commit comments

Comments
 (0)