Skip to content

Commit 5041ae7

Browse files
wherewherewherewhere
committed
Bring back uap10.0.15138.0
1 parent 63cfe1a commit 5041ae7

5 files changed

Lines changed: 50 additions & 31 deletions

File tree

‎AdvancedSharpAdbClient.WinRT/AdvancedSharpAdbClient.WinRT.csproj‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<NoWarn>NU1603;NU5100</NoWarn>
99
<OutputPathRoot Condition="'$(Platform)' == 'AnyCPU'">bin\$(Configuration)\</OutputPathRoot>
1010
<OutputPathRoot Condition="'$(Platform)' != 'AnyCPU'">bin\$(Platform)\$(Configuration)\</OutputPathRoot>
11-
<TargetFrameworks>uap10.0;net6.0-windows10.0.17763.0</TargetFrameworks>
11+
<TargetFrameworks>uap10.0;uap10.0.15138.0;net6.0-windows10.0.17763.0</TargetFrameworks>
1212
</PropertyGroup>
1313

1414
<PropertyGroup Condition="'$(FullTargets)' != 'true'">
1515
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
1616
</PropertyGroup>
1717

18-
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
18+
<PropertyGroup Condition="'$(TargetFramework)' != 'net6.0-windows10.0.17763.0'">
1919
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
2020
<DebugType>Full</DebugType>
2121
<NoWarn>CS0419</NoWarn>
@@ -44,31 +44,35 @@
4444
<None Include="..\build\*" Pack="true" PackagePath="build\">
4545
<Link>Assets\build\%(FileName)%(Extension)</Link>
4646
</None>
47-
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\*" Pack="true" PackagePath="build\native\">
47+
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\*.dll" Pack="true" PackagePath="build\native\">
4848
<Link>Assets\build\native\%(FileName)%(Extension)</Link>
4949
</None>
50-
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.deps.json" />
5150
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.dll" />
52-
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.pdb" />
53-
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.winmd" />
54-
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.xml" />
5551
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.dll" />
56-
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.dll.mui" />
5752
<None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.Shim.dll" />
58-
<None Include="$(OutputPathRoot)uap10.0\AdvancedSharpAdbClient.dll" Pack="true" PackagePath="build\uap10.0\AdvancedSharpAdbClient.dll">
59-
<Link>Assets\build\uap10.0\AdvancedSharpAdbClient.dll</Link>
53+
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.runtimeconfig.json" Condition="Exists('$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.runtimeconfig.json')" Pack="true" PackagePath="build\native\">
54+
<Link>Assets\build\native\%(FileName)%(Extension)</Link>
55+
</None>
56+
<None Include="$(OutputPathRoot)uap10.0.15138.0\*.dll" Pack="true" PackagePath="build\uap10.0.15138\">
57+
<Link>Assets\build\uap10.0.15138\%(FileName)%(Extension)</Link>
58+
</None>
59+
<None Remove="$(OutputPathRoot)uap10.0.15138.0\System.Memory.dll" />
60+
<None Remove="$(OutputPathRoot)uap10.0.15138.0\System.Buffers.dll" />
61+
<None Remove="$(OutputPathRoot)uap10.0.15138.0\System.Runtime.CompilerServices.Unsafe.dll" />
62+
<None Include="$(OutputPathRoot)uap10.0\AdvancedSharpAdbClient.dll" Condition="Exists('$(OutputPathRoot)uap10.0\AdvancedSharpAdbClient.dll')" Pack="true" PackagePath="build\uap10.0\">
63+
<Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
6064
</None>
61-
<None Include="$(OutputPathRoot)uap10.0\Microsoft.Extensions.Logging.Abstractions.dll" Pack="true" PackagePath="build\uap10.0\Microsoft.Extensions.Logging.Abstractions.dll">
62-
<Link>Assets\build\uap10.0\Microsoft.Extensions.Logging.Abstractions.dll</Link>
65+
<None Include="$(OutputPathRoot)uap10.0\Microsoft.Extensions.Logging.Abstractions.dll" Condition="Exists('$(OutputPathRoot)uap10.0\Microsoft.Extensions.Logging.Abstractions.dll')" Pack="true" PackagePath="build\uap10.0\">
66+
<Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
6367
</None>
64-
<None Include="$(OutputPathRoot)uap10.0\System.Runtime.InteropServices.RuntimeInformation.dll" Pack="true" PackagePath="build\uap10.0\System.Runtime.InteropServices.RuntimeInformation.dll">
65-
<Link>Assets\build\uap10.0\System.Runtime.InteropServices.RuntimeInformation.dll</Link>
68+
<None Include="$(OutputPathRoot)uap10.0\System.Runtime.InteropServices.RuntimeInformation.dll" Condition="Exists('$(OutputPathRoot)uap10.0\System.Runtime.InteropServices.RuntimeInformation.dll')" Pack="true" PackagePath="build\uap10.0\">
69+
<Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
6670
</None>
67-
<None Include="$(OutputPathRoot)uap10.0\System.Xml.XPath.dll" Pack="true" PackagePath="build\uap10.0\System.Xml.XPath.dll">
68-
<Link>Assets\build\uap10.0\System.Xml.XPath.dll</Link>
71+
<None Include="$(OutputPathRoot)uap10.0\System.Xml.XPath.dll" Condition="Exists('$(OutputPathRoot)uap10.0\System.Xml.XPath.dll')" Pack="true" PackagePath="build\uap10.0\">
72+
<Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
6973
</None>
70-
<None Include="$(OutputPathRoot)uap10.0\System.Xml.XPath.XmlDocument.dll" Pack="true" PackagePath="build\uap10.0\System.Xml.XPath.XmlDocument.dll">
71-
<Link>Assets\build\uap10.0\System.Xml.XPath.XmlDocument.dll</Link>
74+
<None Include="$(OutputPathRoot)uap10.0\System.Xml.XPath.XmlDocument.dll" Condition="Exists('$(OutputPathRoot)uap10.0\System.Xml.XPath.XmlDocument.dll')" Pack="true" PackagePath="build\uap10.0\">
75+
<Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
7276
</None>
7377
<None Include="..\build\*" Pack="true" PackagePath="buildTransitive\">
7478
<Link>Assets\buildTransitive\%(FileName)%(Extension)</Link>
@@ -79,14 +83,14 @@
7983
<None Include="$(NuGetPackageRoot)microsoft.windows.cswinrt\$(CsWinRTVersion)\hosting\**\native\en-US\*" Pack="true" PackagePath="hosting\">
8084
<Link>Assets\hosting\%(RecursiveDir)\%(FileName)%(Extension)</Link>
8185
</None>
82-
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.winmd" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\winmd\">
83-
<Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\AdvancedSharpAdbClient.WinRT.winmd</Link>
86+
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.winmd" Condition="Exists('$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.winmd')" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\winmd\">
87+
<Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\%(FileName)%(Extension)</Link>
8488
</None>
85-
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.Shim.dll" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\">
86-
<Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\WinRT.Host.Shim.winmd</Link>
89+
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.Shim.dll" Condition="Exists('$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.Shim.dll')" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\">
90+
<Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\%(FileName)%(Extension)</Link>
8791
</None>
88-
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Runtime.dll" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\">
89-
<Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\WinRT.Runtime.winmd</Link>
92+
<None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Runtime.dll" Condition="Exists('$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Runtime.dll')" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\">
93+
<Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\%(FileName)%(Extension)</Link>
9094
</None>
9195
</ItemGroup>
9296

‎Directory.Build.props‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@
3434
</PropertyGroup>
3535

3636
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
37+
<TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
38+
</PropertyGroup>
39+
40+
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.15138.0'">
41+
<TargetPlatformMinVersion>10.0.15138.0</TargetPlatformMinVersion>
42+
</PropertyGroup>
43+
44+
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'
45+
or '$(TargetFramework)' == 'uap10.0.15138.0'">
3746
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
3847
<DefaultLanguage>en-US</DefaultLanguage>
3948
<DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
@@ -42,7 +51,6 @@
4251
<TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
4352
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
4453
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
45-
<TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
4654
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
4755
</PropertyGroup>
4856

‎Directory.Build.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
</PackageReference>
77
</ItemGroup>
88

9-
<ItemGroup Condition="'$(TargetFramework)' == 'uap10.0'">
9+
<ItemGroup Condition="'$(TargetFramework)' == 'uap10.0'
10+
or '$(TargetFramework)' == 'uap10.0.15138.0'">
1011
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" PrivateAssets="all" IsImplicitlyDefined="true" />
1112
</ItemGroup>
1213

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ It's a WinRT package of [AdvancedSharpAdbClient](https://github.com/yungd1plomat
1212

1313
## Support Platform
1414
- UAP 10.0
15-
- .NET 6.0 - Windows 10.0.18362.0
15+
- UAP 10.0.15138.0
16+
- .NET 6.0 - Windows 10.0.17763.0
1617

1718
## Installation
1819
To install AdvancedSharpAdbClient.WinRT install the [AdvancedSharpAdbClient.WinRT NuGetPackage](https://www.nuget.org/packages/AdvancedSharpAdbClient.WinRT).

‎build/AdvancedSharpAdbClient.WinRT.UAP.targets‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<!-- This file was produced from C#/WinRT -->
22
<Project ToolsVersion="14.0" xmln="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<IsUseNetCore463 Condition="'$(IsUseNetCore463)' == '' AND '$(UWPCoreRuntimeSdkVersion)' != '' AND $([MSBuild]::VersionGreaterThanOrEquals($(UWPCoreRuntimeSdkVersion), '2'))">true</IsUseNetCore463>
5+
<_TargetFramework Condition="'$(IsUseNetCore463)' != 'true'">uap10.0</_TargetFramework>
6+
<_TargetFramework Condition="'$(IsUseNetCore463)' == 'true'">uap10.0.15138</_TargetFramework>
7+
</PropertyGroup>
38
<PropertyGroup>
49
<!-- Add the hosting dlls to references so they get binplaced -->
510
<ResolveReferencesDependsOn>AdvancedSharpAdbClient_WinRTCopyAuthoringDlls;$(ResolveReferencesDependsOn)</ResolveReferencesDependsOn>
@@ -8,19 +13,19 @@
813
</PropertyGroup>
914
<ItemGroup>
1015
<!-- Managed, WinRT and SDK.NET dlls -->
11-
<HostingAssets Include="$(MSBuildThisFileDirectory)..\lib\uap10.0\*.dll" />
16+
<HostingAssets Include="$(MSBuildThisFileDirectory)..\lib\$(_TargetFramework)\*.dll" />
1217
<!-- Managed DLLs from packages the component depends on -->
13-
<HostingAssets Include="$(MSBuildThisFileDirectory)..\build\uap10.0\*.dll" />
18+
<HostingAssets Include="$(MSBuildThisFileDirectory)..\build\$(_TargetFramework)\*.dll" />
1419
</ItemGroup>
1520
<!-- Add the WinMD file as a reference of the native app so a projection gets made -->
1621
<Target Name="AdvancedSharpAdbClient_WinRTAddAuthoredWinMDReference" Outputs="@(Reference)">
1722
<ItemGroup Condition="'$(TargetFramework)' == 'native' OR '$(TargetFramework)' == ''">
18-
<Reference Include="$(MSBuildThisFileDirectory)..\lib\uap10.0\*.winmd">
23+
<Reference Include="$(MSBuildThisFileDirectory)..\lib\$(_TargetFramework)\*.winmd">
1924
<IsWinMDFile>true</IsWinMDFile>
2025
</Reference>
2126
</ItemGroup>
2227
<ItemGroup Condition="'$(TargetFramework)' != 'native' AND '$(TargetFramework)' != ''">
23-
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\lib\uap10.0\*.winmd" />
28+
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\lib\$(_TargetFramework)\*.winmd" />
2429
</ItemGroup>
2530
</Target>
2631
<!-- Make sure the runtime assets are available to the app -->

0 commit comments

Comments
 (0)