Bring back uap10.0.15138.0

SharpAdb · Sep 6, 2023 · 5041ae7 · 5041ae7
1 parent 63cfe1a
commit 5041ae7
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 31 deletions.
diff --git a/AdvancedSharpAdbClient.WinRT/AdvancedSharpAdbClient.WinRT.csproj b/AdvancedSharpAdbClient.WinRT/AdvancedSharpAdbClient.WinRT.csproj
@@ -8,14 +8,14 @@
     <NoWarn>NU1603;NU5100</NoWarn>
     <OutputPathRoot Condition="'$(Platform)' == 'AnyCPU'">bin\$(Configuration)\</OutputPathRoot>
     <OutputPathRoot Condition="'$(Platform)' != 'AnyCPU'">bin\$(Platform)\$(Configuration)\</OutputPathRoot>
-    <TargetFrameworks>uap10.0;net6.0-windows10.0.17763.0</TargetFrameworks>
+    <TargetFrameworks>uap10.0;uap10.0.15138.0;net6.0-windows10.0.17763.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(FullTargets)' != 'true'">
     <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' != 'net6.0-windows10.0.17763.0'">
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <DebugType>Full</DebugType>
     <NoWarn>CS0419</NoWarn>
@@ -44,31 +44,35 @@
     <None Include="..\build\*" Pack="true" PackagePath="build\">
       <Link>Assets\build\%(FileName)%(Extension)</Link>
     </None>
-    <None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\*" Pack="true" PackagePath="build\native\">
+    <None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\*.dll" Pack="true" PackagePath="build\native\">
       <Link>Assets\build\native\%(FileName)%(Extension)</Link>
     </None>
-    <None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.deps.json" />
     <None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.dll" />
-    <None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.pdb" />
-    <None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.winmd" />
-    <None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.xml" />
     <None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.dll" />
-    <None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.dll.mui" />
     <None Remove="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.Shim.dll" />
-    <None Include="$(OutputPathRoot)uap10.0\AdvancedSharpAdbClient.dll" Pack="true" PackagePath="build\uap10.0\AdvancedSharpAdbClient.dll">
-      <Link>Assets\build\uap10.0\AdvancedSharpAdbClient.dll</Link>
+    <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\">
+      <Link>Assets\build\native\%(FileName)%(Extension)</Link>
+    </None>
+    <None Include="$(OutputPathRoot)uap10.0.15138.0\*.dll" Pack="true" PackagePath="build\uap10.0.15138\">
+      <Link>Assets\build\uap10.0.15138\%(FileName)%(Extension)</Link>
+    </None>
+    <None Remove="$(OutputPathRoot)uap10.0.15138.0\System.Memory.dll" />
+    <None Remove="$(OutputPathRoot)uap10.0.15138.0\System.Buffers.dll" />
+    <None Remove="$(OutputPathRoot)uap10.0.15138.0\System.Runtime.CompilerServices.Unsafe.dll" />
+    <None Include="$(OutputPathRoot)uap10.0\AdvancedSharpAdbClient.dll" Condition="Exists('$(OutputPathRoot)uap10.0\AdvancedSharpAdbClient.dll')" Pack="true" PackagePath="build\uap10.0\">
+      <Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
     </None>
-    <None Include="$(OutputPathRoot)uap10.0\Microsoft.Extensions.Logging.Abstractions.dll" Pack="true" PackagePath="build\uap10.0\Microsoft.Extensions.Logging.Abstractions.dll">
-      <Link>Assets\build\uap10.0\Microsoft.Extensions.Logging.Abstractions.dll</Link>
+    <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\">
+      <Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
     </None>
-    <None Include="$(OutputPathRoot)uap10.0\System.Runtime.InteropServices.RuntimeInformation.dll" Pack="true" PackagePath="build\uap10.0\System.Runtime.InteropServices.RuntimeInformation.dll">
-      <Link>Assets\build\uap10.0\System.Runtime.InteropServices.RuntimeInformation.dll</Link>
+    <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\">
+      <Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
     </None>
-    <None Include="$(OutputPathRoot)uap10.0\System.Xml.XPath.dll" Pack="true" PackagePath="build\uap10.0\System.Xml.XPath.dll">
-      <Link>Assets\build\uap10.0\System.Xml.XPath.dll</Link>
+    <None Include="$(OutputPathRoot)uap10.0\System.Xml.XPath.dll" Condition="Exists('$(OutputPathRoot)uap10.0\System.Xml.XPath.dll')" Pack="true" PackagePath="build\uap10.0\">
+      <Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
     </None>
-    <None Include="$(OutputPathRoot)uap10.0\System.Xml.XPath.XmlDocument.dll" Pack="true" PackagePath="build\uap10.0\System.Xml.XPath.XmlDocument.dll">
-      <Link>Assets\build\uap10.0\System.Xml.XPath.XmlDocument.dll</Link>
+    <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\">
+      <Link>Assets\build\uap10.0\%(FileName)%(Extension)</Link>
     </None>
     <None Include="..\build\*" Pack="true" PackagePath="buildTransitive\">
       <Link>Assets\buildTransitive\%(FileName)%(Extension)</Link>
@@ -79,14 +83,14 @@
     <None Include="$(NuGetPackageRoot)microsoft.windows.cswinrt\$(CsWinRTVersion)\hosting\**\native\en-US\*" Pack="true" PackagePath="hosting\">
       <Link>Assets\hosting\%(RecursiveDir)\%(FileName)%(Extension)</Link>
     </None>
-    <None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\AdvancedSharpAdbClient.WinRT.winmd" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\winmd\">
-      <Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\AdvancedSharpAdbClient.WinRT.winmd</Link>
+    <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\">
+      <Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\%(FileName)%(Extension)</Link>
     </None>
-    <None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Host.Shim.dll" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\">
-      <Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\WinRT.Host.Shim.winmd</Link>
+    <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\">
+      <Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\%(FileName)%(Extension)</Link>
     </None>
-    <None Include="$(OutputPathRoot)net6.0-windows10.0.17763.0\WinRT.Runtime.dll" Pack="true" PackagePath="lib\net6.0-windows10.0.17763.0\">
-      <Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\WinRT.Runtime.winmd</Link>
+    <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\">
+      <Link>Assets\lib\net6.0-windows10.0.17763.0\winmd\%(FileName)%(Extension)</Link>
     </None>
   </ItemGroup>
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -34,6 +34,15 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+    <TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.15138.0'">
+    <TargetPlatformMinVersion>10.0.15138.0</TargetPlatformMinVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'
+                         or '$(TargetFramework)' == 'uap10.0.15138.0'">
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <DefaultLanguage>en-US</DefaultLanguage>
     <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
@@ -42,7 +51,6 @@
     <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
     <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
   </PropertyGroup>
 

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -6,7 +6,8 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'uap10.0'
+                     or '$(TargetFramework)' == 'uap10.0.15138.0'">
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" PrivateAssets="all" IsImplicitlyDefined="true" />
   </ItemGroup>
 

diff --git a/README.md b/README.md
@@ -12,7 +12,8 @@ It's a WinRT package of [AdvancedSharpAdbClient](https://github.com/yungd1plomat
 
 ## Support Platform
 - UAP 10.0
-- .NET 6.0 - Windows 10.0.18362.0
+- UAP 10.0.15138.0
+- .NET 6.0 - Windows 10.0.17763.0
 
 ## Installation
 To install AdvancedSharpAdbClient.WinRT install the [AdvancedSharpAdbClient.WinRT NuGetPackage](https://www.nuget.org/packages/AdvancedSharpAdbClient.WinRT).

diff --git a/build/AdvancedSharpAdbClient.WinRT.UAP.targets b/build/AdvancedSharpAdbClient.WinRT.UAP.targets
@@ -1,5 +1,10 @@
 <!-- This file was produced from C#/WinRT -->
 <Project ToolsVersion="14.0" xmln="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <IsUseNetCore463 Condition="'$(IsUseNetCore463)' == '' AND '$(UWPCoreRuntimeSdkVersion)' != '' AND $([MSBuild]::VersionGreaterThanOrEquals($(UWPCoreRuntimeSdkVersion), '2'))">true</IsUseNetCore463>
+    <_TargetFramework Condition="'$(IsUseNetCore463)' != 'true'">uap10.0</_TargetFramework>
+    <_TargetFramework Condition="'$(IsUseNetCore463)' == 'true'">uap10.0.15138</_TargetFramework>
+  </PropertyGroup>
   <PropertyGroup>
     <!-- Add the hosting dlls to references so they get binplaced -->
     <ResolveReferencesDependsOn>AdvancedSharpAdbClient_WinRTCopyAuthoringDlls;$(ResolveReferencesDependsOn)</ResolveReferencesDependsOn>
@@ -8,19 +13,19 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- Managed, WinRT and SDK.NET dlls -->
-    <HostingAssets Include="$(MSBuildThisFileDirectory)..\lib\uap10.0\*.dll" />
+    <HostingAssets Include="$(MSBuildThisFileDirectory)..\lib\$(_TargetFramework)\*.dll" />
     <!-- Managed DLLs from packages the component depends on -->
-    <HostingAssets Include="$(MSBuildThisFileDirectory)..\build\uap10.0\*.dll" />
+    <HostingAssets Include="$(MSBuildThisFileDirectory)..\build\$(_TargetFramework)\*.dll" />
   </ItemGroup>
   <!-- Add the WinMD file as a reference of the native app so a projection gets made -->
   <Target Name="AdvancedSharpAdbClient_WinRTAddAuthoredWinMDReference" Outputs="@(Reference)">
     <ItemGroup Condition="'$(TargetFramework)' == 'native' OR '$(TargetFramework)' == ''">
-      <Reference Include="$(MSBuildThisFileDirectory)..\lib\uap10.0\*.winmd">
+      <Reference Include="$(MSBuildThisFileDirectory)..\lib\$(_TargetFramework)\*.winmd">
         <IsWinMDFile>true</IsWinMDFile>
       </Reference>
     </ItemGroup>
     <ItemGroup Condition="'$(TargetFramework)' != 'native' AND '$(TargetFramework)' != ''">
-      <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\lib\uap10.0\*.winmd" />
+      <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\lib\$(_TargetFramework)\*.winmd" />
     </ItemGroup>
   </Target>
   <!-- Make sure the runtime assets are available to the app -->