Made the assembly based on .net standard for wider compatibility

seb776 · Aug 6, 2022 · 16b94e3 · 16b94e3
1 parent 4947a73
commit 16b94e3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 89 deletions.
diff --git 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
@@ -53,11 +53,13 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\GLSLIncludesAssembly\GLSLIncludesAssembly.csproj">
-      <Project>{133cd196-117a-4aa3-b85e-f9033d663d70}</Project>
+      <Project>{6ec4d588-01a9-4764-aadc-3087267c5896}</Project>
       <Name>GLSLIncludesAssembly</Name>
     </ProjectReference>
   </ItemGroup>

diff --git 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
@@ -1,48 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{133CD196-117A-4AA3-B85E-F9033D663D70}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GLSLIncludesAssembly</RootNamespace>
-    <AssemblyName>GLSLIncludesAssembly</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <TargetFrameworks>netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GLSLIncludes.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+
+</Project>
diff --git a/GLSLIncludes/GLSLIncludesAssembly/Properties/AssemblyInfo.cs b/GLSLIncludes/GLSLIncludesAssembly/Properties/AssemblyInfo.cs
-Original file line number
+Diff line change
@@ Expand Up / @@ -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.")]
@@ Expand Down @@