Merge pull request #25 from K-Society/experimental

.targets test.
K-Society · Oct 17, 2023 · 6793afb · 6793afb
2 parents 9ed752e + 00a1864
commit 6793afb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 32 deletions.
diff --git a/src/01/KSociety.SharpCubeProgrammer/Build/KSociety.SharpCubeProgrammer.targets b/src/01/KSociety.SharpCubeProgrammer/Build/KSociety.SharpCubeProgrammer.targets
@@ -2,21 +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' And '$(PlatformTarget)' == 'x86' ">
-    <Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\Programmer\*.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>%(FileName)%(Extension)</Link>
-      <Visible>false</Visible>
-    </Content>
-  </ItemGroup>
-  <ItemGroup Condition=" '$(OS)' == 'WINDOWS_NT' And '$(PlatformTarget)' == 'x64' ">
-    <Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\Programmer\*.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>%(FileName)%(Extension)</Link>
-      <Visible>false</Visible>
-    </Content>
-  </ItemGroup>-->
-  <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>
@@ -29,18 +15,6 @@
       <Link>dll\x64\%(FileName)%(Extension)</Link>
       <Visible>false</Visible>
     </Content>
-  </ItemGroup>
-  <!--<ItemGroup Condition=" '$(OS)' == 'WINDOWS_NT' ">
-    <Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\Programmer\*.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>%(FileName)%(Extension)</Link>
-      <Visible>false</Visible>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\Programmer\*.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
@@ -17,10 +17,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\..\Programmer\x64\*.dll" Pack="true" PackagePath="runtimes\win-x64\native\Programmer" Visible="false" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="..\..\..\x64\Release\*.dll" Pack="true" PackagePath="runtimes\win-x64\native\Programmer" Visible="false" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="..\..\..\Programmer\x86\*.dll" Pack="true" PackagePath="runtimes\win-x86\native\Programmer" Visible="false" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="..\..\..\Win32\Release\*.dll" Pack="true" PackagePath="runtimes\win-x86\native\Programmer" Visible="false" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="..\..\..\Programmer\x64\*.dll" Pack="true" PackagePath="runtimes\win-x64\native\Programmer" Visible="false" CopyToOutputDirectory="Never" />
+    <None Include="..\..\..\x64\Release\*.dll" Pack="true" PackagePath="runtimes\win-x64\native\Programmer" Visible="false" CopyToOutputDirectory="Never" />
+    <None Include="..\..\..\Programmer\x86\*.dll" Pack="true" PackagePath="runtimes\win-x86\native\Programmer" Visible="false" CopyToOutputDirectory="Never" />
+    <None Include="..\..\..\Win32\Release\*.dll" Pack="true" PackagePath="runtimes\win-x86\native\Programmer" Visible="false" CopyToOutputDirectory="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>

diff --git a/src/01/Samples/Programming/Programming.csproj b/src/01/Samples/Programming/Programming.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KSociety.SharpCubeProgrammer" Version="0.0.56" />
+    <PackageReference Include="KSociety.SharpCubeProgrammer" Version="0.0.57" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />