From 16b94e3e69f5a8760cf57b12d55e36d83906bacd Mon Sep 17 00:00:00 2001 From: seb776 Date: Sat, 6 Aug 2022 16:27:55 +0200 Subject: [PATCH] Made the assembly based on .net standard for wider compatibility --- GLSLIncludes/GLSLIncludes.sln | 10 ++-- GLSLIncludes/GLSLIncludes/GLSLIncludes.csproj | 6 ++- GLSLIncludes/GLSLIncludes/Options.cs | 1 + .../GLSLIncludesAssembly.csproj | 51 ++----------------- .../Properties/AssemblyInfo.cs | 36 ------------- 5 files changed, 15 insertions(+), 89 deletions(-) delete mode 100644 GLSLIncludes/GLSLIncludesAssembly/Properties/AssemblyInfo.cs diff --git a/GLSLIncludes/GLSLIncludes.sln b/GLSLIncludes/GLSLIncludes.sln index 914b383..5ec75e9 100644 --- a/GLSLIncludes/GLSLIncludes.sln +++ b/GLSLIncludes/GLSLIncludes.sln @@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GLSLIncludes", "GLSLInclude EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GLSLIncludes_UnitTests", "GLSLIncludes_UnitTests\GLSLIncludes_UnitTests.csproj", "{B308E5E7-8D68-4CC0-8E24-D27A90F83A7A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GLSLIncludesAssembly", "GLSLIncludesAssembly\GLSLIncludesAssembly.csproj", "{133CD196-117A-4AA3-B85E-F9033D663D70}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GLSLIncludesAssembly", "GLSLIncludesAssembly\GLSLIncludesAssembly.csproj", "{6EC4D588-01A9-4764-AADC-3087267C5896}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -23,10 +23,10 @@ Global {B308E5E7-8D68-4CC0-8E24-D27A90F83A7A}.Debug|Any CPU.Build.0 = Debug|Any CPU {B308E5E7-8D68-4CC0-8E24-D27A90F83A7A}.Release|Any CPU.ActiveCfg = Release|Any CPU {B308E5E7-8D68-4CC0-8E24-D27A90F83A7A}.Release|Any CPU.Build.0 = Release|Any CPU - {133CD196-117A-4AA3-B85E-F9033D663D70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {133CD196-117A-4AA3-B85E-F9033D663D70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {133CD196-117A-4AA3-B85E-F9033D663D70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {133CD196-117A-4AA3-B85E-F9033D663D70}.Release|Any CPU.Build.0 = Release|Any CPU + {6EC4D588-01A9-4764-AADC-3087267C5896}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6EC4D588-01A9-4764-AADC-3087267C5896}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6EC4D588-01A9-4764-AADC-3087267C5896}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6EC4D588-01A9-4764-AADC-3087267C5896}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/GLSLIncludes/GLSLIncludes/GLSLIncludes.csproj b/GLSLIncludes/GLSLIncludes/GLSLIncludes.csproj index c6db688..932c536 100644 --- a/GLSLIncludes/GLSLIncludes/GLSLIncludes.csproj +++ b/GLSLIncludes/GLSLIncludes/GLSLIncludes.csproj @@ -53,11 +53,13 @@ - + + Designer + - {133cd196-117a-4aa3-b85e-f9033d663d70} + {6ec4d588-01a9-4764-aadc-3087267c5896} GLSLIncludesAssembly diff --git a/GLSLIncludes/GLSLIncludes/Options.cs b/GLSLIncludes/GLSLIncludes/Options.cs index a287039..172b787 100644 --- a/GLSLIncludes/GLSLIncludes/Options.cs +++ b/GLSLIncludes/GLSLIncludes/Options.cs @@ -7,6 +7,7 @@ namespace GLSLIncludes { + public class Options { [Option('o', "output", Required = false, Min = 1, Max = 1, HelpText = "Provide output format. {fileNameNoExt} and {ext} can be used.")] diff --git a/GLSLIncludes/GLSLIncludesAssembly/GLSLIncludesAssembly.csproj b/GLSLIncludes/GLSLIncludesAssembly/GLSLIncludesAssembly.csproj index 8228c56..96c9852 100644 --- a/GLSLIncludes/GLSLIncludesAssembly/GLSLIncludesAssembly.csproj +++ b/GLSLIncludes/GLSLIncludesAssembly/GLSLIncludesAssembly.csproj @@ -1,48 +1,7 @@ - - - + + - Debug - AnyCPU - {133CD196-117A-4AA3-B85E-F9033D663D70} - Library - Properties - GLSLIncludesAssembly - GLSLIncludesAssembly - v4.6.1 - 512 - true + netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0; - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - \ No newline at end of file + + diff --git a/GLSLIncludes/GLSLIncludesAssembly/Properties/AssemblyInfo.cs b/GLSLIncludes/GLSLIncludesAssembly/Properties/AssemblyInfo.cs deleted file mode 100644 index bf07dc9..0000000 --- a/GLSLIncludes/GLSLIncludesAssembly/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("GLSLIncludesAssembly")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GLSLIncludesAssembly")] -[assembly: AssemblyCopyright("Copyright © 2022")] -[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("133cd196-117a-4aa3-b85e-f9033d663d70")] - -// 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")]