Testing.

K-Society · Oct 18, 2023 · a830f46 · a830f46
1 parent f81c41f
commit a830f46
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/src/01/KSociety.SharpCubeProgrammer/Build/KSociety.SharpCubeProgrammer.targets b/src/01/KSociety.SharpCubeProgrammer/Build/KSociety.SharpCubeProgrammer.targets
@@ -2,7 +2,7 @@
 <!-- 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="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Condition=" '$(OS)' == 'WINDOWS_NT' ">
+  <!--<ItemGroup Condition=" '$(OS)' == 'WINDOWS_NT' ">
     <Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\Programmer\*.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>dll\x86\%(FileName)%(Extension)</Link>
@@ -25,6 +25,30 @@
       <Link>%(FileName)%(Extension)</Link>
       <Visible>false</Visible>
     </Content>
+  </ItemGroup>-->
+  <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\x86\STLinkUSBDriver.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>%(FileName)%(Extension)</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\x64\STLinkUSBDriver.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>%(FileName)%(Extension)</Link>
+      <Visible>false</Visible>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <StFlashLoaderFiles Include="$(MSBuildThisFileDirectory)/../contentFiles/FlashLoader/*.*" />

diff --git a/src/01/KSociety.SharpCubeProgrammer/KSociety.SharpCubeProgrammer.csproj b/src/01/KSociety.SharpCubeProgrammer/KSociety.SharpCubeProgrammer.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Platforms>AnyCPU;x64;x86</Platforms>
-    <developmentDependency>true</developmentDependency>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,12 +18,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\..\Programmer\x64\*.dll" Pack="true" PackagePath="runtimes\win-x64\native\Programmer" Visible="false" Exclude="**\STLinkUSBDriver.dll" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
+    <!--<None Include="..\..\..\Programmer\x64\*.dll" Pack="true" PackagePath="runtimes\win-x64\native\Programmer" Visible="false" Exclude="**\STLinkUSBDriver.dll" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
     <None Include="..\..\..\Programmer\x64\STLinkUSBDriver.dll" Pack="true" PackagePath="runtimes\win-x64\native" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
     <None Include="..\..\..\x64\Release\*.dll" Pack="true" PackagePath="runtimes\win-x64\native\Programmer" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
     <None Include="..\..\..\Programmer\x86\*.dll" Pack="true" PackagePath="runtimes\win-x86\native\Programmer" Visible="false" Exclude="**\STLinkUSBDriver.dll" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
     <None Include="..\..\..\Programmer\x86\STLinkUSBDriver.dll" Pack="true" PackagePath="runtimes\win-x86\native" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
-    <None Include="..\..\..\Win32\Release\*.dll" Pack="true" PackagePath="runtimes\win-x86\native\Programmer" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
+    <None Include="..\..\..\Win32\Release\*.dll" Pack="true" PackagePath="runtimes\win-x86\native\Programmer" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />-->
+    <None Include="..\..\..\Programmer\x64\*.dll" Pack="true" PackagePath="build\native\x64\Programmer" Visible="false" Exclude="**\STLinkUSBDriver.dll" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
+    <None Include="..\..\..\Programmer\x64\STLinkUSBDriver.dll" Pack="true" PackagePath="build\native\x64" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
+    <None Include="..\..\..\x64\Release\*.dll" Pack="true" PackagePath="build\native\x64\Programmer" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
+    <None Include="..\..\..\Programmer\x86\*.dll" Pack="true" PackagePath="build\native\x86\Programmer" Visible="false" Exclude="**\STLinkUSBDriver.dll" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
+    <None Include="..\..\..\Programmer\x86\STLinkUSBDriver.dll" Pack="true" PackagePath="build\native\x86" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
+    <None Include="..\..\..\Win32\Release\*.dll" Pack="true" PackagePath="build\native\x86\Programmer" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
     <None Include="..\..\..\Data_Base\*.*" Pack="true" PackagePath="contentFiles\Data_Base" Visible="false" />
     <None Include="..\..\..\Programmer\FlashLoader\*.*" Pack="true" PackagePath="contentFiles\FlashLoader" Visible="false" />
   </ItemGroup>