From 0fe8b381c10a81838ce724e60ae3f2c9e52b8004 Mon Sep 17 00:00:00 2001 From: Cynthia Date: Tue, 6 Feb 2024 10:57:50 -0800 Subject: [PATCH 1/3] move signing to be release only refs #1 this helps fix the initial "build fail due to missing key" if someone just checks out the project loads it up, or tries to build it in debug mode. since releases are really the only things we should be signing it was quick to move it in there. long term, we still want folks being able to build release builds locally too, without a key/generating one, and only sign the real releases we distribute to folks, but this gets me unblocked to start porting the build from MSBuild (something windows only), to the newer dotnet build stuff that is cross platform --- AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj b/AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj index a64f171..20c7d26 100644 --- a/AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj +++ b/AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj @@ -47,6 +47,7 @@ TRACE prompt 4 + true 8C26734D6AC4E12062A9F4AF2B1C64330FB784B2 @@ -57,9 +58,6 @@ true - - true - e-reader-ccc.ico From 9470d1a5ef62f6456993ce2458051c4ca8ba5b69 Mon Sep 17 00:00:00 2001 From: Cynthia Date: Tue, 6 Feb 2024 12:23:00 -0800 Subject: [PATCH 2/3] latest dotnet, buildable with `dotnet` cli tool start prepping for multi os build workflows by allowing us to build with the newer `dotnet` cross platform tooling, this also just upgrades us to the latest dotnet lts i also started cleaning up the csproj file so it's a bit more clear to read for external parties, and hopefully easier to read. part of this was just done by the dotnet upgradeassistant, part of it was required to make it work without warnings on the latest dotnet build, other parts were just me cleaning up best practices (like removing the home directory of a certain user :) they can still specify it manually if they need too). --- AC_e-Reader_Card_Creator.sln | 4 +- .../AC_e-Reader_Card_Creator.csproj | 238 ++++-------------- .../Properties/AssemblyInfo.cs | 36 --- 3 files changed, 47 insertions(+), 231 deletions(-) delete mode 100644 AC_e-Reader_Card_Creator/Properties/AssemblyInfo.cs diff --git a/AC_e-Reader_Card_Creator.sln b/AC_e-Reader_Card_Creator.sln index 9101b25..3438837 100644 --- a/AC_e-Reader_Card_Creator.sln +++ b/AC_e-Reader_Card_Creator.sln @@ -1,9 +1,9 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.6.33829.357 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AC_e-Reader_Card_Creator", "AC_e-Reader_Card_Creator\AC_e-Reader_Card_Creator.csproj", "{61E3E092-ADF9-4613-B6FB-205DD4F5A7E9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AC_e-Reader_Card_Creator", "AC_e-Reader_Card_Creator\AC_e-Reader_Card_Creator.csproj", "{61E3E092-ADF9-4613-B6FB-205DD4F5A7E9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj b/AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj index 20c7d26..18d32ee 100644 --- a/AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj +++ b/AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj @@ -1,19 +1,9 @@ - - - + - Debug - AnyCPU - {61E3E092-ADF9-4613-B6FB-205DD4F5A7E9} + net8.0-windows WinExe AC_e_Reader_Card_Creator - AC_e-Reader_Card_Creator - v4.7.2 - 512 - true - true false - C:\Users\hunte\OneDrive\Desktop\e-Reader CCC\ true Disk false @@ -28,196 +18,54 @@ false true true + true + true + true + true - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - + - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + 8C26734D6AC4E12062A9F4AF2B1C64330FB784B2 + AC_e-Reader_Card_Creator_TemporaryKey.pfx true - - 8C26734D6AC4E12062A9F4AF2B1C64330FB784B2 - - - AC_e-Reader_Card_Creator_TemporaryKey.pfx - - - true - + + + + e-reader-ccc.ico - - - - - - - - - - - - - - - - - - - - Form - - - CCC-Frontend.cs - - - Form - - - Print-Frontend.cs - - - - - CCC-Frontend.cs - - - Print-Frontend.cs - - - PublicResXFileCodeGenerator - Designer - Resources.Designer.cs - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + %(RecursiveDir)\Project Files\References\%(Filename)%(Extension) + PreserveNewest + + + %(RecursiveDir)\Project Files\References\%(Filename)%(Extension) + PreserveNewest + + + %(RecursiveDir)\Project Files\Decompression\External\%(Filename)%(Extension) + PreserveNewest + + + %(RecursiveDir)\Project Files\Decompression\External\%(Filename)%(Extension) + PreserveNewest + + + %(RecursiveDir)\Project Files\Resources\%(Filename)%(Extension) + PreserveNewest + + + %(RecursiveDir)\Project Files\Resources\%(Filename)%(Extension) + PreserveNewest + + False @@ -230,5 +78,9 @@ false - + + + + + \ No newline at end of file diff --git a/AC_e-Reader_Card_Creator/Properties/AssemblyInfo.cs b/AC_e-Reader_Card_Creator/Properties/AssemblyInfo.cs deleted file mode 100644 index 5a195dc..0000000 --- a/AC_e-Reader_Card_Creator/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -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("AC_e-Reader_Card_Creator")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("AC_e-Reader_Card_Creator")] -[assembly: AssemblyCopyright("Copyright © 2024")] -[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("61e3e092-adf9-4613-b6fb-205dd4f5a7e9")] - -// 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")] From 7d6dd82380da32be557e9ff1cf972b902997fce4 Mon Sep 17 00:00:00 2001 From: Cynthia Date: Tue, 6 Feb 2024 12:52:40 -0800 Subject: [PATCH 3/3] migrate to newer signing infra with snk - folks can now build a release/debug build without having a key locally. - when we want to publish a release that has been signed you can use: `-p:SignAssemblies=True`. - I know you already have a PFX file, so you'll need to convert it to a strongnamekey (there are lots of tools for this online, but if you need any help let me know). --- .gitignore | 2 +- AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8a30d25..f8b7f9e 100644 --- a/.gitignore +++ b/.gitignore @@ -242,7 +242,7 @@ orleans.codegen.cs # Including strong name files can present a security risk # (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk +*.snk # Since there are multiple workflows, uncomment next line to ignore bower_components # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) diff --git a/AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj b/AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj index 18d32ee..9c82e59 100644 --- a/AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj +++ b/AC_e-Reader_Card_Creator/AC_e-Reader_Card_Creator.csproj @@ -24,13 +24,12 @@ true - - 8C26734D6AC4E12062A9F4AF2B1C64330FB784B2 - AC_e-Reader_Card_Creator_TemporaryKey.pfx + + AC_e-Reader_Card_Creator_TemporaryKey.snk true - - + +