Merge pull request #181 from K-Society/NewNativeDllStrategy

Testing.
K-Society · Jan 2, 2025 · 8a6cf25 · 8a6cf25
2 parents 3d900f9 + 434414c
commit 8a6cf25
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 37 deletions.
diff --git a/src/01/KSociety.SharpCubeProgrammer/Build/KSociety.SharpCubeProgrammer.targets b/src/01/KSociety.SharpCubeProgrammer/Build/KSociety.SharpCubeProgrammer.targets
@@ -2,40 +2,6 @@
 <!-- Copyright © K-Society and contributors. All rights reserved. Licensed under the K-Society License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Condition=" '$(OS)' == 'WINDOWS_NT' ">
-    <Content Include="$(MSBuildThisFileDirectory)native\x86\Programmer\*.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>dll\x86\%(FileName)%(Extension)</Link>
-      <Visible>false</Visible>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)native\Programmer\version">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>dll\x86\version</Link>
-      <Visible>false</Visible>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)native\x86\STLinkUSBDriver.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>dll\x86\STLinkUSBDriver.dll</Link>
-      <Visible>false</Visible>
-    </Content>
-  </ItemGroup>
-  <ItemGroup Condition=" '$(OS)' == 'WINDOWS_NT' ">
-    <Content Include="$(MSBuildThisFileDirectory)native\x64\Programmer\*.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>dll\x64\%(FileName)%(Extension)</Link>
-      <Visible>false</Visible>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)native\Programmer\version">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>dll\x64\version</Link>
-      <Visible>false</Visible>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)native\x64\STLinkUSBDriver.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>dll\x64\STLinkUSBDriver.dll</Link>
-      <Visible>false</Visible>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <None Update="@(None)">
       <Visible Condition="'%(NuGetItemType)' == 'None' and '%(NuGetPackageId)' == 'KSociety.SharpCubeProgrammer'">False</Visible>

diff --git a/src/01/KSociety.SharpCubeProgrammer/KSociety.SharpCubeProgrammer.csproj b/src/01/KSociety.SharpCubeProgrammer/KSociety.SharpCubeProgrammer.csproj
@@ -9,7 +9,7 @@
     <RootNamespace>SharpCubeProgrammer</RootNamespace>
   </PropertyGroup>
 
-  <!--<ItemGroup>
+  <ItemGroup>
     <Content Include="BuildMultiTargeting\KSociety.SharpCubeProgrammer.props">
       <PackagePath>buildMultiTargeting</PackagePath>
       <Pack>true</Pack>
@@ -20,7 +20,7 @@
     </Content>
     <Content Include="Build\KSociety.SharpCubeProgrammer.targets" Pack="true" PackagePath="build" />
     <Content Include="Build\KSociety.SharpCubeProgrammer.props" Pack="true" PackagePath="build" />
-  </ItemGroup>-->
+  </ItemGroup>
 
   <ItemGroup>
     <None Include="..\..\..\build\Programmer\bin\x64\$(Configuration)\*.dll" Pack="true" PackagePath="runtimes\win-x64\native" Visible="false">

diff --git a/src/01/Samples/QuickStart/QuickStart.csproj b/src/01/Samples/QuickStart/QuickStart.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\KSociety.SharpCubeProgrammer\KSociety.SharpCubeProgrammer.csproj" />
+    <PackageReference Include="KSociety.SharpCubeProgrammer" Version="0.4.23" />
   </ItemGroup>
 
 </Project>