Projects merged into one solution

fjay69 · Aug 1, 2023 · 9a35471 · 9a35471
1 parent d842b2e
commit 9a35471
Show file tree

Hide file tree

Showing 40 changed files with 674 additions and 958 deletions.
diff --git a/GameMakerStringsEditor/.gitignore b/GameMakerStringsEditor/.gitignore
@@ -1,2 +1,3 @@
-*.pdb
-.vs/GameMakerStringsEditor/v14/.suo
+/bin/*
+/obj/*
+/Properties/*
diff --git a/GameMakerStringsEditor/.vs/GameMakerStringsEditor/v14/.suo b/GameMakerStringsEditor/.vs/GameMakerStringsEditor/v14/.suo
diff --git a/GameMakerStringsEditor/.vs/GameMakerStringsEditor/v15/.suo b/GameMakerStringsEditor/.vs/GameMakerStringsEditor/v15/.suo
diff --git a/...sEditor/GameMakerStringsEditor/App.config → GameMakerStringsEditor/App.config b/...sEditor/GameMakerStringsEditor/App.config → GameMakerStringsEditor/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/...or/GameMakerStringsEditor/AssemblyInfo.cs → GameMakerStringsEditor/AssemblyInfo.cs b/...or/GameMakerStringsEditor/AssemblyInfo.cs → GameMakerStringsEditor/AssemblyInfo.cs
diff --git a/...gsEditor/GameMakerStringsEditor/Class1.cs → GameMakerStringsEditor/Class1.cs b/...gsEditor/GameMakerStringsEditor/Class1.cs → GameMakerStringsEditor/Class1.cs
diff --git a/.../GameMakerStringsEditor/Form1.Designer.cs → GameMakerStringsEditor/Form1.Designer.cs b/.../GameMakerStringsEditor/Form1.Designer.cs → GameMakerStringsEditor/Form1.Designer.cs
diff --git a/...ngsEditor/GameMakerStringsEditor/Form1.cs → GameMakerStringsEditor/Form1.cs b/...ngsEditor/GameMakerStringsEditor/Form1.cs → GameMakerStringsEditor/Form1.cs
diff --git a/...sEditor/GameMakerStringsEditor/Form1.resx → GameMakerStringsEditor/Form1.resx b/...sEditor/GameMakerStringsEditor/Form1.resx → GameMakerStringsEditor/Form1.resx
diff --git a/...ringsEditor/GameMakerStringsEditor.csproj → ...ringsEditor/GameMakerStringsEditor.csproj b/...ringsEditor/GameMakerStringsEditor.csproj → ...ringsEditor/GameMakerStringsEditor.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>GameMakerStringsEditor</RootNamespace>
     <AssemblyName>GameMakerStringsEditor</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -26,7 +27,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -67,6 +68,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

diff --git a/GameMakerStringsEditor/GameMakerStringsEditor.sln b/GameMakerStringsEditor/GameMakerStringsEditor.sln
diff --git a/GameMakerStringsEditor/GameMakerStringsEditor/.gitignore b/GameMakerStringsEditor/GameMakerStringsEditor/.gitignore
diff --git a/GameMakerStringsEditor/GameMakerStringsEditor/Properties/AssemblyInfo.cs b/GameMakerStringsEditor/GameMakerStringsEditor/Properties/AssemblyInfo.cs
diff --git a/GameMakerStringsEditor/GameMakerStringsEditor/Properties/Resources.Designer.cs b/GameMakerStringsEditor/GameMakerStringsEditor/Properties/Resources.Designer.cs
diff --git a/GameMakerStringsEditor/GameMakerStringsEditor/Properties/Resources.resx b/GameMakerStringsEditor/GameMakerStringsEditor/Properties/Resources.resx
diff --git a/GameMakerStringsEditor/GameMakerStringsEditor/Properties/Settings.Designer.cs b/GameMakerStringsEditor/GameMakerStringsEditor/Properties/Settings.Designer.cs
diff --git a/GameMakerStringsEditor/GameMakerStringsEditor/Properties/Settings.settings b/GameMakerStringsEditor/GameMakerStringsEditor/Properties/Settings.settings
diff --git a/...sEditor/GameMakerStringsEditor/Program.cs → GameMakerStringsEditor/Program.cs b/...sEditor/GameMakerStringsEditor/Program.cs → GameMakerStringsEditor/Program.cs
diff --git a/TXTRCut/App.config b/TXTRCut/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/TXTRCut/TXTRCut.csproj b/TXTRCut/TXTRCut.csproj
@@ -8,9 +8,10 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>TXTRCut</RootNamespace>
     <AssemblyName>TXTRCut</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -26,7 +27,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -44,7 +45,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />