Skip to content

Commit 2670cf1

Browse files
wherewherewherewhere
committed
Remove uap10.0.15138.0 since CPP/UWP only supports uap10.0
1 parent a88f1b1 commit 2670cf1

4 files changed

Lines changed: 43 additions & 64 deletions

File tree

‎AdvancedSharpAdbClient.WinRT/AdvancedSharpAdbClient.WinRT.csproj‎

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
<PropertyGroup>
44
<FullTargets>True</FullTargets>
5+
<OutputPathRoot Condition="'$(Platform)' == 'AnyCPU'">bin\$(Configuration)\</OutputPathRoot>
6+
<OutputPathRoot Condition="'$(Platform)' != 'AnyCPU'">bin\$(Platform)\$(Configuration)\</OutputPathRoot>
57
</PropertyGroup>
68

79
<PropertyGroup Condition="'$(FullTargets)' == 'true'">
8-
<NoWarn>NU1603</NoWarn>
9-
<TargetFrameworks>uap10.0;uap10.0.15138.0;net6.0-windows10.0.17763.0</TargetFrameworks>
10+
<NoWarn>NU1603;NU5100</NoWarn>
11+
<TargetFrameworks>uap10.0;net6.0-windows10.0.17763.0</TargetFrameworks>
1012
</PropertyGroup>
1113

1214
<PropertyGroup Condition="'$(FullTargets)' != 'true'">
@@ -30,60 +32,64 @@
3032
<PackageReference Include="AdvancedSharpAdbClient" Version="2.5.7" />
3133
</ItemGroup>
3234

33-
<ItemGroup Condition="'$(FullTargets)' == 'true'">
35+
<ItemGroup>
3436
<None Include="..\logo.png" Pack="true" PackagePath="\Icon.png">
3537
<Link>Assets\Icon.png</Link>
3638
</None>
39+
</ItemGroup>
40+
41+
<ItemGroup Condition="'$(FullTargets)' == 'true'">
3742
<None Include="..\build\*" Pack="true" PackagePath="build\">
3843
<Link>Assets\build\%(FileName)%(Extension)</Link>
3944
</None>
40-
<None Include="bin\$(Configuration)\net6.0-windows10.0.17763.0\*" Pack="true" PackagePath="build\native\">
45+
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\*" Pack="true" PackagePath="build\native\">
4146
<Link>Assets\build\native\%(FileName)%(Extension)</Link>
4247
</None>
43-
<None Remove="bin\$(Configuration)\net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.deps.json" />
44-
<None Remove="bin\$(Configuration)\net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.dll" />
45-
<None Remove="bin\$(Configuration)\net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.pdb" />
46-
<None Remove="bin\$(Configuration)\net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.winmd" />
47-
<None Remove="bin\$(Configuration)\net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.xml" />
48-
<None Remove="bin\$(Configuration)\net6.0-windows10.0.17763.0\WinRT.Host.dll" />
49-
<None Remove="bin\$(Configuration)\net6.0-windows10.0.17763.0\WinRT.Host.dll.mui" />
50-
<None Remove="bin\$(Configuration)\net6.0-windows10.0.17763.0\WinRT.Host.Shim.dll" />
51-
<None Include="bin\$(Configuration)\uap10.0\*" Pack="true" PackagePath="build\uap10.0\">
52-
<Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
48+
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.deps.json" />
49+
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.dll" />
50+
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.pdb" />
51+
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.winmd" />
52+
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.xml" />
53+
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.dll" />
54+
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.dll.mui" />
55+
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.Shim.dll" />
56+
<None Include="$(OutputPathRoot)uap10.0\AdvancedSharpAdbClient.dll" Pack="true" PackagePath="build\uap10.0\AdvancedSharpAdbClient.dll">
57+
<Link>Assets\build\uap10.0\AdvancedSharpAdbClient.dll</Link>
58+
</None>
59+
<None Include="$(OutputPathRoot)uap10.0\Microsoft.Extensions.Logging.Abstractions.dll" Pack="true" PackagePath="build\uap10.0\Microsoft.Extensions.Logging.Abstractions.dll">
60+
<Link>Assets\build\uap10.0\Microsoft.Extensions.Logging.Abstractions.dll</Link>
61+
</None>
62+
<None Include="$(OutputPathRoot)uap10.0\System.Runtime.InteropServices.RuntimeInformation.dll" Pack="true" PackagePath="build\uap10.0\System.Runtime.InteropServices.RuntimeInformation.dll">
63+
<Link>Assets\build\uap10.0\System.Runtime.InteropServices.RuntimeInformation.dll</Link>
64+
</None>
65+
<None Include="$(OutputPathRoot)uap10.0\System.Xml.XPath.dll" Pack="true" PackagePath="build\uap10.0\System.Xml.XPath.dll">
66+
<Link>Assets\build\uap10.0\System.Xml.XPath.dll</Link>
5367
</None>
54-
<None Remove="bin\$(Configuration)\uap10.0\AdvancedSharpAdbClient.WinRT.pdb" />
55-
<None Remove="bin\$(Configuration)\uap10.0\AdvancedSharpAdbClient.WinRT.pri" />
56-
<None Remove="bin\$(Configuration)\uap10.0\AdvancedSharpAdbClient.WinRT.winmd" />
57-
<None Remove="bin\$(Configuration)\uap10.0\AdvancedSharpAdbClient.WinRT.xml" />
58-
<None Include="bin\$(Configuration)\uap10.0.15138.0\*" Pack="true" PackagePath="build\uap10.0.15138\">
59-
<Link>Assets\build\uap10.0.15138\%(FileName)%(Extension)</Link>
68+
<None Include="$(OutputPathRoot)uap10.0\System.Xml.XPath.XmlDocument.dll" Pack="true" PackagePath="build\uap10.0\System.Xml.XPath.XmlDocument.dll">
69+
<Link>Assets\build\uap10.0\System.Xml.XPath.XmlDocument.dll</Link>
6070
</None>
61-
<None Remove="bin\$(Configuration)\uap10.0.15138.0\AdvancedSharpAdbClient.WinRT.pdb" />
62-
<None Remove="bin\$(Configuration)\uap10.0.15138.0\AdvancedSharpAdbClient.WinRT.pri" />
63-
<None Remove="bin\$(Configuration)\uap10.0.15138.0\AdvancedSharpAdbClient.WinRT.winmd" />
64-
<None Remove="bin\$(Configuration)\uap10.0.15138.0\AdvancedSharpAdbClient.WinRT.xml" />
6571
<None Include="..\build\*" Pack="true" PackagePath="buildTransitive\">
6672
<Link>Assets\buildTransitive\%(FileName)%(Extension)</Link>
6773
</None>
68-
<None Include="$(NuGetPackageRoot)microsoft.windows.cswinrt\2.0.3\hosting\**\native\*" Pack="true" PackagePath="hosting\">
74+
<None Include="$(NuGetPackageRoot)microsoft.windows.cswinrt\$(CsWinRTVersion)\hosting\**\native\*" Pack="true" PackagePath="hosting\">
6975
<Link>Assets\hosting\%(RecursiveDir)\%(FileName)%(Extension)</Link>
7076
</None>
71-
<None Include="$(NuGetPackageRoot)microsoft.windows.cswinrt\2.0.3\hosting\**\native\en-US\*" Pack="true" PackagePath="hosting\">
77+
<None Include="$(NuGetPackageRoot)microsoft.windows.cswinrt\$(CsWinRTVersion)\hosting\**\native\en-US\*" Pack="true" PackagePath="hosting\">
7278
<Link>Assets\hosting\%(RecursiveDir)\%(FileName)%(Extension)</Link>
7379
</None>
74-
<None Include="bin\$(Configuration)\net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.winmd" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\winmd\">
80+
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.winmd" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\winmd\">
7581
<Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\AdvancedSharpAdbClient.WinRT.winmd</Link>
7682
</None>
77-
<None Include="bin\$(Configuration)\net6.0-windows10.0.17763.0\WinRT.Host.Shim.dll" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\">
83+
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.Shim.dll" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\">
7884
<Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\WinRT.Host.Shim.winmd</Link>
7985
</None>
80-
<None Include="bin\$(Configuration)\net6.0-windows10.0.17763.0\WinRT.Runtime.dll" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\">
86+
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Runtime.dll" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\">
8187
<Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\WinRT.Runtime.winmd</Link>
8288
</None>
8389
</ItemGroup>
8490

8591
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows10.0.17763.0'">
86-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.3" />
92+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(CsWinRTVersion)" />
8793
</ItemGroup>
8894

8995
</Project>

‎Directory.Build.props‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,13 @@
2727

2828
<PropertyGroup>
2929
<FullTargets Condition="'$(FullTargets)' == ''">False</FullTargets>
30-
<ImportAsync Condition="'$(ImportAsync)' == ''">False</ImportAsync>
3130
<IsWindows Condition="'$(IsWindows)' == ''">False</IsWindows>
31+
<CsWinRTVersion Condition="'$(CsWinRTVersion)' == ''">2.0.3</CsWinRTVersion>
3232
<IsWindows Condition="$([MSBuild]::IsOSPlatform('Windows')) == 'True' OR '$(Platform)' == 'Windows NT'">True</IsWindows>
3333
<IsTestProject Condition="'$(IsTestProject)' == ''">$(MSBuildProjectName.Contains('.Test'))</IsTestProject>
3434
</PropertyGroup>
3535

36-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcore50'">
37-
<NugetTargetMoniker>.NETCore,Version=v5.0</NugetTargetMoniker>
38-
</PropertyGroup>
39-
40-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
41-
<SuppressTfmSupportBuildWarnings>True</SuppressTfmSupportBuildWarnings>
42-
</PropertyGroup>
43-
4436
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
45-
<TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
46-
</PropertyGroup>
47-
48-
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.15138.0'">
49-
<TargetPlatformMinVersion>10.0.15138.0</TargetPlatformMinVersion>
50-
</PropertyGroup>
51-
52-
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'
53-
or '$(TargetFramework)' == 'uap10.0.15138.0'">
5437
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
5538
<DefaultLanguage>en-US</DefaultLanguage>
5639
<DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
@@ -59,6 +42,7 @@
5942
<TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
6043
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
6144
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
45+
<TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
6246
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
6347
</PropertyGroup>
6448

‎Directory.Build.targets‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@
66
</PackageReference>
77
</ItemGroup>
88

9-
<ItemGroup Condition="'$(TargetFramework)' == 'netcore50'">
10-
<PackageReference Include="Microsoft.NETCore" Version="5.0.2" PrivateAssets="all" IsImplicitlyDefined="true" />
11-
<PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.2" PrivateAssets="all" IsImplicitlyDefined="true" />
12-
</ItemGroup>
13-
14-
<ItemGroup Condition="'$(TargetFramework)' == 'uap10.0'
15-
or '$(TargetFramework)' == 'uap10.0.15138.0'">
9+
<ItemGroup Condition="'$(TargetFramework)' == 'uap10.0'">
1610
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" PrivateAssets="all" IsImplicitlyDefined="true" />
1711
</ItemGroup>
1812

‎build/AdvancedSharpAdbClient.WinRT.UAP.targets‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,21 @@
66
<!-- Add authored component's winmd to references before C++/WinRT runs -->
77
<BuildDependsOn>AdvancedSharpAdbClient_WinRTAddAuthoredWinMDReference;$(BuildDependsOn)</BuildDependsOn>
88
</PropertyGroup>
9-
<PropertyGroup>
10-
<IsUseUAP10 Condition="'$(IsUseUAP10)' == '' AND $([MSBuild]::VersionLessThan($(WindowsTargetPlatformMinVersion), '10.0.15138.0'))">true</IsUseUAP10>
11-
<_TargetFramework Condition="'$(IsUseUAP10)' == 'true'">uap10.0</_TargetFramework>
12-
<_TargetFramework Condition="'$(IsUseUAP10)' != 'true'">uap10.0.15138</_TargetFramework>
13-
</PropertyGroup>
149
<ItemGroup>
1510
<!-- Managed, WinRT and SDK.NET dlls -->
16-
<HostingAssets Include="$(MSBuildThisFileDirectory)..\lib\$(_TargetFramework)\*.dll" />
11+
<HostingAssets Include="$(MSBuildThisFileDirectory)..\lib\uap10.0\*.dll" />
1712
<!-- Managed DLLs from packages the component depends on -->
18-
<HostingAssets Include="$(MSBuildThisFileDirectory)..\build\$(_TargetFramework)\*.dll" />
13+
<HostingAssets Include="$(MSBuildThisFileDirectory)..\build\uap10.0\*.dll" />
1914
</ItemGroup>
2015
<!-- Add the WinMD file as a reference of the native app so a projection gets made -->
2116
<Target Name="AdvancedSharpAdbClient_WinRTAddAuthoredWinMDReference" Outputs="@(Reference)">
2217
<ItemGroup Condition="'$(TargetFramework)' == 'native' OR '$(TargetFramework)' == ''">
23-
<Reference Include="$(MSBuildThisFileDirectory)..\lib\$(_TargetFramework)\*.winmd">
18+
<Reference Include="$(MSBuildThisFileDirectory)..\lib\uap10.0\*.winmd">
2419
<IsWinMDFile>true</IsWinMDFile>
2520
</Reference>
2621
</ItemGroup>
2722
<ItemGroup Condition="'$(TargetFramework)' != 'native' AND '$(TargetFramework)' != ''">
28-
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\lib\$(_TargetFramework)\*.winmd" />
23+
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\lib\uap10.0\*.winmd" />
2924
</ItemGroup>
3025
</Target>
3126
<!-- Make sure the runtime assets are available to the app -->

0 commit comments

Comments
 (0)