Skip to content

Commit

Permalink
update to net6
Browse files Browse the repository at this point in the history
  • Loading branch information
Grille committed Nov 11, 2021
1 parent aea5cd6 commit e860428
Show file tree
Hide file tree
Showing 14 changed files with 209 additions and 399 deletions.
19 changes: 12 additions & 7 deletions 2D-isoedit.sln
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "2D-isoedit", "2D-isoedit\2D-isoedit.csproj", "{D87893FC-ABFB-466B-BA6A-A79830B293E2}"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "2D-isoedit", "2D-isoedit\2D-isoedit.csproj", "{D87893FC-ABFB-466B-BA6A-A79830B293E2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D87893FC-ABFB-466B-BA6A-A79830B293E2}.Debug|x86.ActiveCfg = Debug|x86
{D87893FC-ABFB-466B-BA6A-A79830B293E2}.Debug|x86.Build.0 = Debug|x86
{D87893FC-ABFB-466B-BA6A-A79830B293E2}.Release|x86.ActiveCfg = Release|x86
{D87893FC-ABFB-466B-BA6A-A79830B293E2}.Release|x86.Build.0 = Release|x86
{D87893FC-ABFB-466B-BA6A-A79830B293E2}.Debug|x86.ActiveCfg = Debug|Any CPU
{D87893FC-ABFB-466B-BA6A-A79830B293E2}.Debug|x86.Build.0 = Debug|Any CPU
{D87893FC-ABFB-466B-BA6A-A79830B293E2}.Release|x86.ActiveCfg = Release|Any CPU
{D87893FC-ABFB-466B-BA6A-A79830B293E2}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {979D3ABE-EC50-4986-A0B1-A96C125F6E24}
EndGlobalSection
EndGlobal
Binary file removed 2D-isoedit.suo
Binary file not shown.
177 changes: 28 additions & 149 deletions 2D-isoedit/2D-isoedit.csproj
Original file line number Diff line number Diff line change
@@ -1,168 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D87893FC-ABFB-466B-BA6A-A79830B293E2}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>program</RootNamespace>
<AssemblyName>2D-isoedit</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>assets\cube.ico</ApplicationIcon>
<UseWindowsForms>true</UseWindowsForms>
<DisableWinExeOutputInference>true</DisableWinExeOutputInference>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>cube.ico</ApplicationIcon>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>False</Optimize>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Content Include="assets\cube.ico" />
</ItemGroup>
<ItemGroup>
<Compile Include="src\graphic\RenderData.cs" />
<Compile Include="src\graphic\Texture.cs" />
<Compile Include="src\graphic\TexturePack.cs" />
<Compile Include="src\graphic\TextureSegment.cs" />
<Compile Include="src\gui\FormImport.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\gui\FormImport.Designer.cs">
<DependentUpon>FormImport.cs</DependentUpon>
</Compile>
<Compile Include="src\gui\FormRenderSettings.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\gui\FormRenderSettings.Designer.cs">
<DependentUpon>FormRenderSettings.cs</DependentUpon>
</Compile>
<Compile Include="src\gui\FormToolbox.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\gui\FormToolbox.Designer.cs">
<DependentUpon>FormToolbox.cs</DependentUpon>
</Compile>
<Compile Include="src\util\Settings.cs" />
<Compile Include="src\util\ByteStream.cs" />
<Compile Include="src\FormEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\FormEditor.Designer.cs">
<DependentUpon>FormEditor.cs</DependentUpon>
</Compile>
<Compile Include="src\graphic\IsometricRenderer.cs" />
<Compile Include="src\gui\FormTextureEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\gui\FormTextureEditor.Designer.cs">
<DependentUpon>FormTextureEditor.cs</DependentUpon>
</Compile>
<Compile Include="src\util\LockBitmap.cs" />
<Compile Include="src\Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="src\FormEditor.resx">
<DependentUpon>FormEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="src\gui\FormImport.resx">
<DependentUpon>FormImport.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="src\gui\FormTextureEditor.resx">
<DependentUpon>FormTextureEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="src\gui\FormToolbox.resx">
<DependentUpon>FormToolbox.cs</DependentUpon>
</EmbeddedResource>
<None Include="app.config" />
<None Include="examples\config.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="src\app.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<Content Include="assets\cube.ico" />
<Content Include="assets\drag.png" />
<Content Include="assets\rotate.png" />
<Content Include="cube.ico" />
<Content Include="examples\default.txt">
<ContentWithTargetPath Include="examples\config.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<TargetPath>config.ini</TargetPath>
</ContentWithTargetPath>
<None Update="examples\default.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="examples\Factory_256.png">
</None>
<None Update="examples\Factory_256.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="examples\Factory_256_tex.png">
</None>
<None Update="examples\Factory_256_tex.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="examples\Maze_256.png">
</None>
<None Update="examples\Maze_256.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="examples\Maze_256_tex.png">
</None>
<None Update="examples\Maze_256_tex.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="examples\Mountain_512.png">
</None>
<None Update="examples\Mountain_512.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="examples\Mountain_512_tex.png">
</None>
<None Update="examples\Mountain_512_tex.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
36 changes: 0 additions & 36 deletions 2D-isoedit/Properties/AssemblyInfo.cs

This file was deleted.

63 changes: 0 additions & 63 deletions 2D-isoedit/Properties/Resources.Designer.cs

This file was deleted.

13 changes: 8 additions & 5 deletions 2D-isoedit/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
Expand All @@ -60,6 +60,7 @@
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
Expand All @@ -68,9 +69,10 @@
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
Expand All @@ -85,9 +87,10 @@
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
Expand All @@ -109,9 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
Loading

0 comments on commit e860428

Please sign in to comment.