Update build configs

srwi · Jan 26, 2023 · 914e20e · 914e20e
1 parent 20fb9e0
commit 914e20e
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 deletions.
diff --git a/EverythingToolbar.Deskband/CSDeskBand.cs b/EverythingToolbar.Deskband/CSDeskBand.cs
@@ -1018,10 +1018,10 @@ public CSDeskBandWpf()
         {
             ToolbarLogger.Initialize();
             _logger.Info($"EverythingToolbar Deskband {Assembly.GetExecutingAssembly().GetName().Version} started. OS: {Environment.OSVersion}");
-            //AppDomain.CurrentDomain.FirstChanceException += (sender, e) =>
-            //{
-            //	ToolbarLogger.Error(e.Exception, "Unhandled first chance exception");
-            //};
+            // AppDomain.CurrentDomain.FirstChanceException += (sender, e) =>
+            // {
+            // 	_logger.Error(e.Exception, "Unhandled first chance exception");
+            // };
 
             Options.Title = RegistrationHelper.GetToolbarName(GetType());
 

diff --git a/EverythingToolbar.Deskband/EverythingToolbar.Deskband.csproj b/EverythingToolbar.Deskband/EverythingToolbar.Deskband.csproj
@@ -83,9 +83,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>taskkill /f /im explorer.exe 2&gt;nul &amp;set errorlevel=0
-xcopy $(ProjectDir)..\EverythingSDK\x64\$(ConfigurationName)\Everything64.dll $(ProjectDir)$(OutDir) /c /i /r /y
-xcopy $(ProjectDir)..\README.md $(ProjectDir)$(OutDir) /c /i /r /y
-xcopy $(ProjectDir)..\LICENSE $(ProjectDir)$(OutDir) /c /i /r /y
+xcopy $(SolutionDir)EverythingSDK\x64\$(ConfigurationName)\Everything64.dll $(TargetDir) /r /y
 Exit 0</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/EverythingToolbar.Installer/EverythingToolbar.Installer.wixproj b/EverythingToolbar.Installer/EverythingToolbar.Installer.wixproj
@@ -46,4 +46,8 @@
   <Target Name="BeforeBuild">
     <HeatDirectory Directory="..\EverythingToolbar.Launcher\bin\$(Configuration)" PreprocessorVariable="var.HarvestPath" OutputFile="HeatGeneratedFileList.wxs" ComponentGroupName="HeatGenerated" DirectoryRefId="APPLICATIONFOLDER" AutogenerateGuids="true" ToolPath="$(WixToolPath)" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" Transforms="$(ProjectDir)\HeatXsl.xslt" RunAsSeparateProcess="$(RunWixToolsOutOfProc)" />
   </Target>
+  <PropertyGroup>
+    <PreBuildEvent>xcopy $(SolutionDir)README.md $(SolutionDir)EverythingToolbar.Launcher\bin\Release /r /y
+xcopy $(SolutionDir)LICENSE $(SolutionDir)EverythingToolbar.Launcher\bin\Release /r /y</PreBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/EverythingToolbar.Launcher/EverythingToolbar.Launcher.csproj b/EverythingToolbar.Launcher/EverythingToolbar.Launcher.csproj
@@ -159,9 +159,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>taskkill /IM EverythingToolbar.Launcher.exe /F 2&gt;nul &amp;set errorlevel=0
-xcopy $(ProjectDir)..\EverythingSDK\x64\$(ConfigurationName)\Everything64.dll $(ProjectDir)$(OutDir) /c /i /r /y
-xcopy $(ProjectDir)..\README.md $(ProjectDir)$(OutDir) /c /i /r /y
-xcopy $(ProjectDir)..\LICENSE $(ProjectDir)$(OutDir) /c /i /r /y
+xcopy $(SolutionDir)EverythingSDK\x64\$(ConfigurationName)\Everything64.dll $(TargetDir) /r /y
 Exit 0</PreBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/EverythingToolbar.sln b/EverythingToolbar.sln
@@ -12,13 +12,21 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "EverythingToolbar.Installer
 	ProjectSection(ProjectDependencies) = postProject
 		{C8BB766A-D7BC-47F5-A0E7-D3225DD1F469} = {C8BB766A-D7BC-47F5-A0E7-D3225DD1F469}
 		{FC46FED2-0B98-497F-8F88-037A0780ACF2} = {FC46FED2-0B98-497F-8F88-037A0780ACF2}
+		{BF806AC1-5839-4DAA-90F2-9D6F2B65C0FD} = {BF806AC1-5839-4DAA-90F2-9D6F2B65C0FD}
+		{C3F92B04-FFA3-40DE-A64A-00019C5A8852} = {C3F92B04-FFA3-40DE-A64A-00019C5A8852}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EverythingToolbar.Launcher", "EverythingToolbar.Launcher\EverythingToolbar.Launcher.csproj", "{FC46FED2-0B98-497F-8F88-037A0780ACF2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BF806AC1-5839-4DAA-90F2-9D6F2B65C0FD} = {BF806AC1-5839-4DAA-90F2-9D6F2B65C0FD}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EverythingSDK", "EverythingSDK\EverythingSDK.vcxproj", "{BF806AC1-5839-4DAA-90F2-9D6F2B65C0FD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EverythingToolbar.Deskband", "EverythingToolbar.Deskband\EverythingToolbar.Deskband.csproj", "{C3F92B04-FFA3-40DE-A64A-00019C5A8852}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BF806AC1-5839-4DAA-90F2-9D6F2B65C0FD} = {BF806AC1-5839-4DAA-90F2-9D6F2B65C0FD}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/EverythingToolbar/EverythingToolbar.csproj b/EverythingToolbar/EverythingToolbar.csproj
@@ -633,6 +633,12 @@
     <PackageReference Include="NHotkey.Wpf" Version="2.1.0" />
     <PackageReference Include="NLog" Version="5.1.1" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\EverythingSDK\EverythingSDK.vcxproj">
+      <Project>{bf806ac1-5839-4daa-90f2-9d6f2b65c0fd}</Project>
+      <Name>EverythingSDK</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

diff --git a/LICENSE b/LICENSE
@@ -2,7 +2,7 @@ EverythingToolbar
 
 MIT License
 
-Copyright (c) 2022 Stephan Rumswinkel
+Copyright (c) 2023 Stephan Rumswinkel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal