From d868fe150fde91927c96deaed663acbf165b39f1 Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Mon, 28 Sep 2020 02:26:29 -0400 Subject: update build config --- .gitignore | 2 ++ Alpha.zip | Bin 2072225 -> 0 bytes grapher/grapher.csproj | 38 +++++++++++++++++++++ grapher/mouse.ico | Bin 0 -> 112630 bytes installer/installer.vcxproj | 3 ++ rawaccel.sln | 10 +++++- uninstaller/uninstaller.vcxproj | 3 ++ wrapper-deps/Class1.cs | 12 +++++++ wrapper-deps/Properties/AssemblyInfo.cs | 36 ++++++++++++++++++++ wrapper-deps/packages.config | 4 +++ wrapper-deps/wrapper-deps.csproj | 57 ++++++++++++++++++++++++++++++++ wrapper/wrapper.vcxproj | 8 ++++- writer/packages.config | 4 +++ writer/writer.csproj | 10 ++++-- 14 files changed, 183 insertions(+), 4 deletions(-) delete mode 100644 Alpha.zip create mode 100644 grapher/mouse.ico create mode 100644 wrapper-deps/Class1.cs create mode 100644 wrapper-deps/Properties/AssemblyInfo.cs create mode 100644 wrapper-deps/packages.config create mode 100644 wrapper-deps/wrapper-deps.csproj create mode 100644 writer/packages.config diff --git a/.gitignore b/.gitignore index 4ce6fdd..35e04b4 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,8 @@ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ +signed/* +!signed/driver/ # Visual Studio 2015/2017 cache/options directory .vs/ diff --git a/Alpha.zip b/Alpha.zip deleted file mode 100644 index af777f0..0000000 Binary files a/Alpha.zip and /dev/null differ diff --git a/grapher/grapher.csproj b/grapher/grapher.csproj index 9e9b15b..3e23226 100644 --- a/grapher/grapher.csproj +++ b/grapher/grapher.csproj @@ -12,6 +12,21 @@ 512 true true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true true @@ -35,6 +50,9 @@ MinimumRecommendedRules.ruleset true + + mouse.ico + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -140,5 +158,25 @@ + + + False + Microsoft .NET Framework 4.7.2 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + + + IF ($(ConfigurationName)) == (Debug) GOTO END +copy /Y "$(TargetPath)" "$(SolutionDir)signed\$(TargetFileName)" +:END + \ No newline at end of file diff --git a/grapher/mouse.ico b/grapher/mouse.ico new file mode 100644 index 0000000..493036a Binary files /dev/null and b/grapher/mouse.ico differ diff --git a/installer/installer.vcxproj b/installer/installer.vcxproj index a91ed09..8ff13a6 100644 --- a/installer/installer.vcxproj +++ b/installer/installer.vcxproj @@ -95,6 +95,9 @@ install.manifest + + copy /Y "$(TargetPath)" "$(SolutionDir)signed\$(TargetFileName)" + diff --git a/rawaccel.sln b/rawaccel.sln index cfbbc23..683d51f 100644 --- a/rawaccel.sln +++ b/rawaccel.sln @@ -14,11 +14,16 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uninstaller", "uninstaller\uninstaller.vcxproj", "{A4097FF6-A6F0-44E8-B8D0-538D0FB75936}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wrapper", "wrapper\wrapper.vcxproj", "{28A3656F-A1DE-405C-B547-191C32EC555F}" + ProjectSection(ProjectDependencies) = postProject + {0695A19E-8B14-4DE7-AADF-97E5912B197C} = {0695A19E-8B14-4DE7-AADF-97E5912B197C} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "grapher", "grapher\grapher.csproj", "{EF67F71F-ABF5-4760-B50D-D1B9836DF01C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "writer", "writer\writer.csproj", "{28ACF254-E4EF-4A0E-9761-0FE22048D6FD}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wrapper-deps", "wrapper-deps\wrapper-deps.csproj", "{0695A19E-8B14-4DE7-AADF-97E5912B197C}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution common-install\common-install.vcxitems*{058d66c6-d88b-4fdb-b0e4-0a6fe7483b95}*SharedItemsImports = 9 @@ -35,7 +40,6 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {60D6C942-AC20-4C05-A2BE-54B5C966534D}.Debug|x64.ActiveCfg = Debug|x64 {60D6C942-AC20-4C05-A2BE-54B5C966534D}.Debug|x64.Build.0 = Debug|x64 - {60D6C942-AC20-4C05-A2BE-54B5C966534D}.Debug|x64.Deploy.0 = Debug|x64 {60D6C942-AC20-4C05-A2BE-54B5C966534D}.Release|x64.ActiveCfg = Release|x64 {60D6C942-AC20-4C05-A2BE-54B5C966534D}.Release|x64.Build.0 = Release|x64 {896950D1-520A-420A-B6B1-73014B92A68C}.Debug|x64.ActiveCfg = Debug|x64 @@ -58,6 +62,10 @@ Global {28ACF254-E4EF-4A0E-9761-0FE22048D6FD}.Debug|x64.Build.0 = Debug|x64 {28ACF254-E4EF-4A0E-9761-0FE22048D6FD}.Release|x64.ActiveCfg = Release|x64 {28ACF254-E4EF-4A0E-9761-0FE22048D6FD}.Release|x64.Build.0 = Release|x64 + {0695A19E-8B14-4DE7-AADF-97E5912B197C}.Debug|x64.ActiveCfg = Debug|x64 + {0695A19E-8B14-4DE7-AADF-97E5912B197C}.Debug|x64.Build.0 = Debug|x64 + {0695A19E-8B14-4DE7-AADF-97E5912B197C}.Release|x64.ActiveCfg = Release|x64 + {0695A19E-8B14-4DE7-AADF-97E5912B197C}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/uninstaller/uninstaller.vcxproj b/uninstaller/uninstaller.vcxproj index 95a9dc8..f7e9f75 100644 --- a/uninstaller/uninstaller.vcxproj +++ b/uninstaller/uninstaller.vcxproj @@ -81,6 +81,9 @@ true RequireAdministrator + + copy /Y "$(TargetPath)" "$(SolutionDir)signed\$(TargetFileName)" + diff --git a/wrapper-deps/Class1.cs b/wrapper-deps/Class1.cs new file mode 100644 index 0000000..397bd8f --- /dev/null +++ b/wrapper-deps/Class1.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace wrapper_deps +{ + public class Class1 + { + } +} diff --git a/wrapper-deps/Properties/AssemblyInfo.cs b/wrapper-deps/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..4e2bc26 --- /dev/null +++ b/wrapper-deps/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("wrapper-deps")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("wrapper-deps")] +[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("0695a19e-8b14-4de7-aadf-97e5912b197c")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/wrapper-deps/packages.config b/wrapper-deps/packages.config new file mode 100644 index 0000000..a9de8b5 --- /dev/null +++ b/wrapper-deps/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/wrapper-deps/wrapper-deps.csproj b/wrapper-deps/wrapper-deps.csproj new file mode 100644 index 0000000..35391b5 --- /dev/null +++ b/wrapper-deps/wrapper-deps.csproj @@ -0,0 +1,57 @@ + + + + + Debug + AnyCPU + {0695A19E-8B14-4DE7-AADF-97E5912B197C} + Library + Properties + wrapper_deps + wrapper-deps + v4.7.2 + 512 + true + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + + + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wrapper/wrapper.vcxproj b/wrapper/wrapper.vcxproj index 37060ad..6c85a57 100644 --- a/wrapper/wrapper.vcxproj +++ b/wrapper/wrapper.vcxproj @@ -66,6 +66,10 @@ + + copy /Y "$(TargetPath)" "$(SolutionDir)signed\$(TargetFileName)" & +copy /Y "$(TargetDir)Newtonsoft.Json.dll" "$(SolutionDir)signed\Newtonsoft.Json.dll" + @@ -75,7 +79,9 @@ - + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + diff --git a/writer/packages.config b/writer/packages.config new file mode 100644 index 0000000..a9de8b5 --- /dev/null +++ b/writer/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/writer/writer.csproj b/writer/writer.csproj index 4befc1a..a28d5ef 100644 --- a/writer/writer.csproj +++ b/writer/writer.csproj @@ -36,8 +36,8 @@ true - - ..\x64\Release\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -54,6 +54,7 @@ + @@ -62,4 +63,9 @@ + + IF ($(ConfigurationName)) == (Debug) GOTO END +copy /Y "$(TargetPath)" "$(SolutionDir)signed\$(TargetFileName)" +:END + \ No newline at end of file -- cgit v1.2.3