Skip to content

Commit d2cb983

Browse files
author
Oren Novotny
authored
Merge pull request #183 from onovotny/uwp-updates
Updates to fix #182
2 parents f1476ba + 79ac352 commit d2cb983

File tree

6 files changed

+30
-29
lines changed

6 files changed

+30
-29
lines changed

‎MSBuild.Sdk.Extras.sln‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 15
3-
VisualStudioVersion = 15.0.27130.2026
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.29305.180
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8647C74A-083C-4EAF-B9B0-2172D4A27BFC}"
66
ProjectSection(SolutionItems) = preProject
@@ -36,6 +36,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{19A683CB
3636
Tools\MSBuild.Packaging.targets = Tools\MSBuild.Packaging.targets
3737
EndProjectSection
3838
EndProject
39+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UwpClassLibrary", "Tests\UwpClassLibrary\UwpClassLibrary.csproj", "{B7617E50-4107-4C19-BDCF-012CCDB22FB0}"
40+
EndProject
3941
Global
4042
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4143
Debug|Any CPU = Debug|Any CPU
@@ -74,6 +76,10 @@ Global
7476
{C2EE161F-0521-47F7-BE2D-0B55CA8B3C53}.Debug|Any CPU.Build.0 = Debug|Any CPU
7577
{C2EE161F-0521-47F7-BE2D-0B55CA8B3C53}.Release|Any CPU.ActiveCfg = Release|Any CPU
7678
{C2EE161F-0521-47F7-BE2D-0B55CA8B3C53}.Release|Any CPU.Build.0 = Release|Any CPU
79+
{B7617E50-4107-4C19-BDCF-012CCDB22FB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80+
{B7617E50-4107-4C19-BDCF-012CCDB22FB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
81+
{B7617E50-4107-4C19-BDCF-012CCDB22FB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
82+
{B7617E50-4107-4C19-BDCF-012CCDB22FB0}.Release|Any CPU.Build.0 = Release|Any CPU
7783
EndGlobalSection
7884
GlobalSection(SolutionProperties) = preSolution
7985
HideSolutionNode = FALSE
@@ -87,6 +93,7 @@ Global
8793
{96E4CC91-6E55-4650-BA58-D6D1EF138EE2} = {26026DB4-DD68-43BF-8858-15AD2016C0B2}
8894
{C2EE161F-0521-47F7-BE2D-0B55CA8B3C53} = {26026DB4-DD68-43BF-8858-15AD2016C0B2}
8995
{19A683CB-8C5D-480B-8D60-30F28DA40660} = {8647C74A-083C-4EAF-B9B0-2172D4A27BFC}
96+
{B7617E50-4107-4C19-BDCF-012CCDB22FB0} = {26026DB4-DD68-43BF-8858-15AD2016C0B2}
9097
EndGlobalSection
9198
GlobalSection(ExtensibilityGlobals) = postSolution
9299
SolutionGuid = {93349570-79D8-4F89-8E78-C66401620727}

‎Source/MSBuild.Sdk.Extras/Build/LanguageTargets/Windows.targets‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,6 @@
2020
<ImplicitFrameworkDefine Condition="'$(DisableImplicitFrameworkDefines)' != 'true' AND '$(_SdkLanguageSourceName)' != 'VisualBasic'">UAP$(_SdkShortFrameworkVersion.Replace('.', '_'));UAP$(TargetPlatformMinVersion.Replace('.', '_'))</ImplicitFrameworkDefine>
2121
<ImplicitFrameworkDefine Condition="'$(DisableImplicitFrameworkDefines)' != 'true' AND '$(_SdkLanguageSourceName)' == 'VisualBasic'">UAP$(_SdkShortFrameworkVersion.Replace('.', '_'))=-1,UAP$(TargetPlatformMinVersion.Replace('.', '_'))</ImplicitFrameworkDefine>
2222

23-
<!-- Decide whether to use the new version metadata, or the old one -->
24-
<_ExtrasUseVersionedWindowsWinmdFile Condition="$([System.Version]::Parse('$(TargetPlatformVersion)')) >= $([System.Version]::Parse('10.0.16299.0'))">true</_ExtrasUseVersionedWindowsWinmdFile>
25-
26-
<WindowsWinmdFile Condition="'$(_ExtrasUseVersionedWindowsWinmdFile)' == 'true' AND Exists('$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\$(TargetPlatformVersion)\Windows.winmd')">$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\$(TargetPlatformVersion)\Windows.winmd</WindowsWinmdFile>
27-
<WindowsWinmdFile Condition="'$(_ExtrasUseVersionedWindowsWinmdFile)' != 'true' AND Exists('$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\Windows.winmd')">$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\Windows.winmd</WindowsWinmdFile>
28-
29-
<_ExtrasShowWindowsSdkError>false</_ExtrasShowWindowsSdkError>
30-
<_ExtrasShowWindowsSdkError Condition="'$(DisableImplicitFrameworkReferences)' != 'true' AND '$(WindowsWinmdFile)' == '' ">true</_ExtrasShowWindowsSdkError>
3123
</PropertyGroup>
3224

33-
<ItemGroup Condition="'$(DisableImplicitFrameworkReferences)' != 'true' AND '$(WindowsWinmdFile)' != '' ">
34-
<_SdkWindowsImplicitReference Include="Windows" Private="false" HintPath="$(WindowsWinmdFile)" IsWinMDFile="true" Pack="false" />
35-
<_SdkWindowsImplicitReference Remove="@(Reference)"/>
36-
<Reference Include="@(_SdkWindowsImplicitReference)"/>
37-
</ItemGroup>
38-
39-
<Target Name="_WarnIfWindowsSdkIsMissing" BeforeTargets="CoreCompile">
40-
<Error Condition="'$(_ExtrasShowWindowsSdkError)' == 'true'"
41-
Text="Required Windows SDK Version $(TargetPlatformVersion) is not installed." />
42-
</Target>
43-
4425
</Project>

‎Source/MSBuild.Sdk.Extras/Build/Platforms/Windows.targets‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
<!-- Need to override the built-in implicit defines for win8 or it'll be NETCORE4_5 -->
2121
<ImplicitFrameworkDefine Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">WINDOWS8</ImplicitFrameworkDefine>
22-
<WindowsWinmdFile Condition="Exists('$(MSBuildProgramFiles32)\Windows Kits\8.0\References\CommonConfiguration\Neutral\Windows.winmd')">$(MSBuildProgramFiles32)\Windows Kits\8.0\References\CommonConfiguration\Neutral\Windows.winmd</WindowsWinmdFile>
23-
<ImplicitlyExpandTargetPlatform>false</ImplicitlyExpandTargetPlatform>
2422
</PropertyGroup>
2523

2624
<PropertyGroup Condition="'$(TargetFramework)' == 'win81'">
@@ -32,8 +30,6 @@
3230

3331
<!-- Need to override the built-in implicit defines for win81 or it'll be NETCORE4_5_1 -->
3432
<ImplicitFrameworkDefine Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">WINDOWS8_1</ImplicitFrameworkDefine>
35-
<WindowsWinmdFile Condition="Exists('$(MSBuildProgramFiles32)\Windows Kits\8.1\References\CommonConfiguration\Neutral\Windows.winmd')">$(MSBuildProgramFiles32)\Windows Kits\8.1\References\CommonConfiguration\Neutral\Windows.winmd</WindowsWinmdFile>
36-
<ImplicitlyExpandTargetPlatform>false</ImplicitlyExpandTargetPlatform>
3733
</PropertyGroup>
3834

3935
<PropertyGroup Condition="'$(TargetFramework)' == 'wpa' OR '$(TargetFramework)' == 'wpa81'">
@@ -59,9 +55,6 @@
5955
<TargetPlatformMinVersion Condition="'$(TargetPlatformMinVersion)' == ''">$([System.Version]::Parse('$(_SdkShortFrameworkVersion)')).0</TargetPlatformMinVersion>
6056

6157
<CopyLocalLockFileAssemblies Condition="'$(CopyLocalLockFileAssemblies)' == ''">false</CopyLocalLockFileAssemblies>
62-
63-
<ImplicitlyExpandTargetPlatform>false</ImplicitlyExpandTargetPlatform>
64-
6558
</PropertyGroup>
6659

6760
</Project>

‎Source/MSBuild.Sdk.Extras/DefaultItems/ImplicitPackages.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Package Version property for Implicit Packages included in the props file
99
-->
1010
<PropertyGroup Condition="'$(ExtrasUwpMetaPackageVersion)' == ''">
11-
<ExtrasUwpMetaPackageVersion>6.1.9</ExtrasUwpMetaPackageVersion>
11+
<ExtrasUwpMetaPackageVersion>6.2.9</ExtrasUwpMetaPackageVersion>
1212
</PropertyGroup>
1313

1414
<PropertyGroup Condition="'$(ExtrasTizenMetaPackageVersion)' == ''">

‎Tests/UwpClassLibrary/Class1.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
using System;
2+
3+
namespace UwpClassLibrary
4+
{
5+
public class Class1
6+
{
7+
}
8+
}

‎Tests/UwpClassLibrary/UwpClassLibrary.csproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project>
2+
3+
<Import Project="$(MSBuildThisFileDirectory)..\..\Source\MSBuild.Sdk.Extras\Sdk\Sdk.props" />
4+
5+
<PropertyGroup>
6+
<TargetFramework>uap10.0.16299</TargetFramework>
7+
</PropertyGroup>
8+
9+
<Import Project="$(MSBuildThisFileDirectory)..\..\Source\MSBuild.Sdk.Extras\Sdk\Sdk.targets" />
10+
<Import Project="..\Test.targets" />
11+
12+
</Project>

0 commit comments

Comments
 (0)