Change uap10.0 to uap10.0 uap10.0.15138.0

SharpAdb · May 28, 2023 · 9792965 · 9792965
1 parent 4657943
commit 9792965
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/AdvancedSharpAdbClient/AdvancedSharpAdbClient.csproj b/AdvancedSharpAdbClient/AdvancedSharpAdbClient.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <FullTargets>True</FullTargets>
+    <FullTargets>False</FullTargets>
     <NoWarn>CA2254</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(FullTargets)' == 'True'">
     <NoWarn>NU1603;$(NoWarn)</NoWarn>
-    <TargetFrameworks>net3.5-client;net4.0-client;net4.5.2;net4.6.2;net4.7.2;net4.8.1;net6.0;net8.0;netcore50;netcoreapp2.1;netcoreapp3.1;netstandard1.3;netstandard2.0;netstandard2.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net3.5-client;net4.0-client;net4.5.2;net4.6.2;net4.7.2;net4.8.1;net6.0;net8.0;netcore50;netcoreapp2.1;netcoreapp3.1;netstandard1.3;netstandard2.0;netstandard2.1;uap10.0;uap10.0.15138.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(FullTargets)' != 'True'">
@@ -40,10 +40,19 @@
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+    <TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.15138.0'">
+    <TargetPlatformMinVersion>10.0.15138.0</TargetPlatformMinVersion>
+  </PropertyGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'netcore50'
                      or '$(TargetFramework)' == 'netcoreapp1.0'
                      or '$(TargetFramework)' == 'netcoreapp1.1'
-                     or '$(TargetFramework)' == 'netstandard1.3'">
+                     or '$(TargetFramework)' == 'netstandard1.3'
+                     or '$(TargetFramework)' == 'uap10.0'">
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="System.Net.Sockets" Version="4.3.0" />
     <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
@@ -53,7 +62,8 @@
                      or '$(TargetFramework)' == 'netcore50'
                      or '$(TargetFramework)' == 'netcoreapp1.0'
                      or '$(TargetFramework)' == 'netcoreapp1.1'
-                     or '$(TargetFramework)' == 'netstandard1.3'">
+                     or '$(TargetFramework)' == 'netstandard1.3'
+                     or '$(TargetFramework)' == 'uap10.0'">
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
   </ItemGroup>
 
@@ -66,7 +76,7 @@
                      or '$(TargetFramework)' == 'netcoreapp3.1'
                      or '$(TargetFramework)' == 'netstandard2.0'
                      or '$(TargetFramework)' == 'netstandard2.1'
-                     or '$(TargetFramework)' == 'uap10.0'">
+                     or '$(TargetFramework)' == 'uap10.0.15138.0'">
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
   </ItemGroup>
 
@@ -76,7 +86,7 @@
                      or '$(TargetFramework)' == 'netcoreapp3.1'
                      or '$(TargetFramework)' == 'netstandard2.0'
                      or '$(TargetFramework)' == 'netstandard2.1'
-                     or '$(TargetFramework)' == 'uap10.0'">
+                     or '$(TargetFramework)' == 'uap10.0.15138.0'">
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
   </ItemGroup>
 
@@ -89,7 +99,8 @@
                          or '$(TargetFramework)' == 'netcore50'
                          or '$(TargetFramework)' == 'netcoreapp1.0'
                          or '$(TargetFramework)' == 'netcoreapp1.1'
-                         or '$(TargetFramework)' == 'netstandard1.3'">
+                         or '$(TargetFramework)' == 'netstandard1.3'
+                         or '$(TargetFramework)' == 'uap10.0'">
     <DefineConstants>$(DefineConstants);HAS_OLDLOGGER</DefineConstants>
   </PropertyGroup>
 
@@ -103,7 +114,8 @@
   <PropertyGroup Condition="'$(TargetFramework)' != 'netcore50'
                         and '$(TargetFramework)' != 'netcoreapp1.0'
                         and '$(TargetFramework)' != 'netcoreapp1.1'
-                        and '$(TargetFramework)' != 'netstandard1.3'">
+                        and '$(TargetFramework)' != 'netstandard1.3'
+                        and '$(TargetFramework)' != 'uap10.0'">
     <DefineConstants>$(DefineConstants);HAS_PROCESS;HAS_DRAWING;HAS_SERIALIZATION</DefineConstants>
   </PropertyGroup>
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -43,7 +43,8 @@
     <SuppressTfmSupportBuildWarnings>True</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'
+                         or '$(TargetFramework)' == 'uap10.0.15138.0'">
     <CopyLocalLockFileAssemblies>False</CopyLocalLockFileAssemblies>
     <DefaultLanguage>en-US</DefaultLanguage>
     <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
@@ -52,7 +53,6 @@
     <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformMinVersion>10.0.15138.0</TargetPlatformMinVersion>
     <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
   </PropertyGroup>
 

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -15,7 +15,8 @@
     <PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.2" PrivateAssets="all" IsImplicitlyDefined="true" />
   </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>