Merge pull request #478 from microsoft/release/update/241107074307

Fix for Missing Nuget Target in Client Lib Nuget package.
microsoft · Nov 7, 2024 · 42bcd7e · 42bcd7e
2 parents 02bfe18 + a75c7f0
commit 42bcd7e
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/...ralTools/DataverseClient/UnitTests/LivePackageRunUnitTests/LivePackageRunUnitTests.csproj b/...ralTools/DataverseClient/UnitTests/LivePackageRunUnitTests/LivePackageRunUnitTests.csproj
@@ -8,6 +8,7 @@
     <SignAssembly>true</SignAssembly>
     <ComponentAreaName>DataverseClient-Tests-Package</ComponentAreaName>
     <IsPackable>false</IsPackable>
+    <NoWarn>NU1605</NoWarn>
 
     <!-- Ensure we don't clobber local machine's package cache with dev/alpha versions. -->
     <RestorePackagesPath>$(MSBuildThisFileDirectory)..\.packages</RestorePackagesPath>

diff --git a/...ralTools/DataverseClient/UnitTests/LivePackageTestsConsole/LivePackageTestsConsole.csproj b/...ralTools/DataverseClient/UnitTests/LivePackageTestsConsole/LivePackageTestsConsole.csproj
@@ -18,6 +18,7 @@
     </RestoreAdditionalProjectSources>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <TargetDvClientPackageVersion Condition=" '$(TargetDvClientPackageVersion)' == '' ">1.0.26</TargetDvClientPackageVersion>
+    <NoWarn>NU1605</NoWarn>
 
     <!-- Ensure we don't clobber local machine's package cache with dev/alpha versions. -->
     <RestorePackagesPath>$(MSBuildThisFileDirectory)..\.packages</RestorePackagesPath>

diff --git a/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.AzAuth.nuspec b/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.AzAuth.nuspec
@@ -15,24 +15,30 @@
     <tags>Dynamics CommonDataService CDS PowerApps PowerPlatform ServiceClient Dataverse</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.6.2">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.27" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.2.0" exclude="Build,Analyzers" />
         <dependency id="Azure.Identity" version="1.12.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETFramework4.7.2">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.27" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.2.0" exclude="Build,Analyzers" />
         <dependency id="Azure.Identity" version="1.12.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETFramework4.8">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.27" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.2.0" exclude="Build,Analyzers" />
         <dependency id="Azure.Identity" version="1.12.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="NET6.0">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.27" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.2.0" exclude="Build,Analyzers" />
+        <dependency id="Azure.Identity" version="1.12.0" exclude="Build,Analyzers" />
+      </group>
+      <group targetFramework="NET8.0">
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.2.0" exclude="Build,Analyzers" />
         <dependency id="Azure.Identity" version="1.12.0" exclude="Build,Analyzers" />
       </group>
     </dependencies>
   </metadata>
   <files>
+    <file src="{signedBinDir}\{configuration}\DataverseClient\net8.0\Microsoft.PowerPlatform.Dataverse.Client.AzAuth.dll" target="lib\net8.0\Microsoft.PowerPlatform.Dataverse.Client.AzAuth.dll" />
+    <file src="{signedBinDir}\{configuration}\DataverseClient\net8.0\Microsoft.PowerPlatform.Dataverse.Client.AzAuth.xml" target="lib\net8.0\Microsoft.PowerPlatform.Dataverse.Client.AzAuth.xml" />
     <file src="{signedBinDir}\{configuration}\DataverseClient\net6.0\Microsoft.PowerPlatform.Dataverse.Client.AzAuth.dll" target="lib\net6.0\Microsoft.PowerPlatform.Dataverse.Client.AzAuth.dll" />
     <file src="{signedBinDir}\{configuration}\DataverseClient\net6.0\Microsoft.PowerPlatform.Dataverse.Client.AzAuth.xml" target="lib\net6.0\Microsoft.PowerPlatform.Dataverse.Client.AzAuth.xml" />
     <file src="{signedBinDir}\{configuration}\DataverseClient\net472\Microsoft.PowerPlatform.Dataverse.Client.AzAuth.dll" target="lib\net472\Microsoft.PowerPlatform.Dataverse.Client.AzAuth.dll" />

diff --git a/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.Dynamics.nuspec b/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.Dynamics.nuspec
@@ -15,17 +15,21 @@
     <tags>Dynamics CommonDataService CDS PowerApps PowerPlatform ServiceClient Dataverse</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.6.2">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.0" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.2.2" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETFramework4.7.2">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.0" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.2.2" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETFramework4.8">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.0" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.2.2" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="NET6.0">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.0" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.2.2" exclude="Build,Analyzers" />
       </group>
+      <group targetFramework="NET8.0">
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.2.0" exclude="Build,Analyzers" />
+      </group>
+
     </dependencies>
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System.IO" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
@@ -39,6 +43,8 @@
     </frameworkAssemblies>
   </metadata>
   <files>
+    <file src="{signedBinDir}\{configuration}\DataverseClient\net8.0\Microsoft.PowerPlatform.Dataverse.Client.Dynamics.dll" target="lib\net8.0\Microsoft.PowerPlatform.Dataverse.Client.Dynamics.dll" />
+    <file src="{signedBinDir}\{configuration}\DataverseClient\net8.0\Microsoft.PowerPlatform.Dataverse.Client.Dynamics.xml" target="lib\net8.0\Microsoft.PowerPlatform.Dataverse.Client.Dynamics.xml" />
     <file src="{signedBinDir}\{configuration}\DataverseClient\net6.0\Microsoft.PowerPlatform.Dataverse.Client.Dynamics.dll" target="lib\net6.0\Microsoft.PowerPlatform.Dataverse.Client.Dynamics.dll" />
     <file src="{signedBinDir}\{configuration}\DataverseClient\net6.0\Microsoft.PowerPlatform.Dataverse.Client.Dynamics.xml" target="lib\net6.0\Microsoft.PowerPlatform.Dataverse.Client.Dynamics.xml" />
     <file src="{signedBinDir}\{configuration}\DataverseClient\net472\Microsoft.PowerPlatform.Dataverse.Client.Dynamics.dll" target="lib\net472\Microsoft.PowerPlatform.Dataverse.Client.Dynamics.dll" />

diff --git a/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.nuspec b/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.nuspec
@@ -117,6 +117,13 @@
     </frameworkAssemblies>
   </metadata>
   <files>
+    <file src="{signedBinDir}\{configuration}\DataverseClient\net8.0\Microsoft.PowerPlatform.Dataverse.Client.dll" target="lib\net8.0\Microsoft.PowerPlatform.Dataverse.Client.dll" />
+    <file src="{signedBinDir}\{configuration}\DataverseClient\net8.0\Microsoft.Xrm.Sdk.dll" target="lib\net8.0\Microsoft.Xrm.Sdk.dll" />
+    <file src="{signedBinDir}\{configuration}\DataverseClient\net8.0\Microsoft.Crm.Sdk.Proxy.dll" target="lib\net8.0\Microsoft.Crm.Sdk.Proxy.dll" />
+    <file src="{sdkIntellisenseDir}\V9\PublishedXML\CE\Microsoft.PowerPlatform.Dataverse.Client.xml" target="lib\net8.0\Microsoft.PowerPlatform.Dataverse.Client.xml" />
+    <file src="{sdkIntellisenseDir}\V9\PublishedXML\CE\Microsoft.Xrm.Sdk.xml" target="lib\net8.0\Microsoft.Xrm.Sdk.xml" />
+    <file src="{sdkIntellisenseDir}\V9\PublishedXML\CE\Microsoft.Crm.Sdk.Proxy.xml" target="lib\net8.0\Microsoft.Crm.Sdk.Proxy.xml" />
+
     <file src="{signedBinDir}\{configuration}\DataverseClient\net6.0\Microsoft.PowerPlatform.Dataverse.Client.dll" target="lib\net6.0\Microsoft.PowerPlatform.Dataverse.Client.dll" />
     <file src="{signedBinDir}\{configuration}\DataverseClient\net6.0\Microsoft.Xrm.Sdk.dll" target="lib\net6.0\Microsoft.Xrm.Sdk.dll" />
     <file src="{signedBinDir}\{configuration}\DataverseClient\net6.0\Microsoft.Crm.Sdk.Proxy.dll" target="lib\net6.0\Microsoft.Crm.Sdk.Proxy.dll" />