From 40bdd5d64022c67c19d2b451bdff316c07021056 Mon Sep 17 00:00:00 2001
From: AndresTraks <andres.traks@gmail.com>
Date: Thu, 29 Apr 2021 01:20:01 +0300
Subject: [PATCH] Use .NET Core 3.1

---
 .../HlslDecompiler.Tests.csproj               | 402 ++++++++----------
 .../Properties/AssemblyInfo.cs                |  36 --
 HlslDecompiler.Tests/packages.config          |   4 -
 HlslDecompiler.csproj                         | 169 +-------
 HlslDecompiler.sln                            |  29 +-
 Properties/AssemblyInfo.cs                    |  36 --
 app.config                                    |   3 -
 7 files changed, 199 insertions(+), 480 deletions(-)
 delete mode 100644 HlslDecompiler.Tests/Properties/AssemblyInfo.cs
 delete mode 100644 HlslDecompiler.Tests/packages.config
 delete mode 100644 Properties/AssemblyInfo.cs
 delete mode 100644 app.config

diff --git a/HlslDecompiler.Tests/HlslDecompiler.Tests.csproj b/HlslDecompiler.Tests/HlslDecompiler.Tests.csproj
index d2d5a36..cdcc904 100644
--- a/HlslDecompiler.Tests/HlslDecompiler.Tests.csproj
+++ b/HlslDecompiler.Tests/HlslDecompiler.Tests.csproj
@@ -1,362 +1,304 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" 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>{E4C9890B-E6EE-4E7F-B8BA-E036A8CF6383}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HlslDecompiler.Tests</RootNamespace>
-    <AssemblyName>HlslDecompiler.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </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>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.util.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="DecompileTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ProjectReference Include="..\HlslDecompiler.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <Content Include="ShaderAssembly\ps_clip.asm">
+    <None Update="CompiledShaders\ps_absolute_multiply.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_conditional.asm">
+    </None>
+    <None Update="CompiledShaders\ps_clip.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_constant_struct.asm">
+    </None>
+    <None Update="CompiledShaders\ps_conditional.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_dot_product2_add.asm">
+    </None>
+    <None Update="CompiledShaders\ps_constant.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_float4_construct2.asm">
+    </None>
+    <None Update="CompiledShaders\ps_constant_struct.fxc">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="CompiledShaders\ps_dot_product2_add.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_matrix23_vector2_multiply.asm">
+    </None>
+    <None Update="CompiledShaders\ps_float4_constant.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_normalize.asm">
+    </None>
+    <None Update="CompiledShaders\ps_float4_construct.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_length.asm">
+    </None>
+    <None Update="CompiledShaders\ps_float4_construct2.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_dot_product.asm">
+    </None>
+    <None Update="CompiledShaders\ps_multiply_subtract.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_matrix44_vector4_multiply.asm">
+    </None>
+    <None Update="CompiledShaders\ps_negate_absolute.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_matrix33_vector3_multiply.asm">
+    </None>
+    <None Update="CompiledShaders\ps_tex2d.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_submatrix43_vector3_multiply.asm">
+    </None>
+    <None Update="CompiledShaders\ps_tex2d_swizzle.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_vector2_matrix32_multiply.asm">
+    </None>
+    <None Update="CompiledShaders\ps_tex2d_two_samplers.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_vector4_matrix44_multiply.asm">
+    </None>
+    <None Update="CompiledShaders\ps_texcoord.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_vector3_matrix33_multiply.asm">
+    </None>
+    <None Update="CompiledShaders\ps_texcoord_modifier.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_vector2_matrix22_multiply.asm">
+    </None>
+    <None Update="CompiledShaders\ps_texcoord_swizzle.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_matrix22_vector2_multiply.asm">
+    </None>
+    <None Update="CompiledShaders\vs_constant.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_constant_struct.asm">
+    </None>
+    <None Update="CompiledShaders\vs_constant_struct.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\vs_constant.asm">
+    </None>
+    <None Update="CompiledShaders\vs_dot_product.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_clip.fx">
+    </None>
+    <None Update="CompiledShaders\vs_length.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_conditional.fx">
+    </None>
+    <None Update="CompiledShaders\vs_matrix22_vector2_multiply.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_constant_struct.fx">
+    </None>
+    <None Update="CompiledShaders\vs_matrix23_vector2_multiply.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_dot_product2_add.fx">
+    </None>
+    <None Update="CompiledShaders\vs_matrix33_vector3_multiply.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_float4_construct2.fx">
+    </None>
+    <None Update="CompiledShaders\vs_matrix44_vector4_multiply.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_submatrix43_vector3_multiply.fx">
+    </None>
+    <None Update="CompiledShaders\vs_normalize.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_matrix23_vector2_multiply.fx">
+    </None>
+    <None Update="CompiledShaders\vs_submatrix43_vector3_multiply.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_normalize.fx">
+    </None>
+    <None Update="CompiledShaders\vs_vector2_matrix22_multiply.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_length.fx">
+    </None>
+    <None Update="CompiledShaders\vs_vector2_matrix32_multiply.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_dot_product.fx">
+    </None>
+    <None Update="CompiledShaders\vs_vector3_matrix33_multiply.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_matrix44_vector4_multiply.fx">
+    </None>
+    <None Update="CompiledShaders\vs_vector4_matrix44_multiply.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_vector2_matrix32_multiply.fx">
+    </None>
+    <None Update="ShaderAssembly\ps_absolute_multiply.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_vector4_matrix44_multiply.fx">
+    </None>
+    <None Update="ShaderAssembly\ps_clip.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_vector3_matrix33_multiply.fx">
+    </None>
+    <None Update="ShaderAssembly\ps_conditional.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_matrix33_vector3_multiply.fx">
+    </None>
+    <None Update="ShaderAssembly\ps_constant.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_vector2_matrix22_multiply.fx">
+    </None>
+    <None Update="ShaderAssembly\ps_constant_struct.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_matrix22_vector2_multiply.fx">
+    </None>
+    <None Update="ShaderAssembly\ps_dot_product2_add.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_constant_struct.fx">
+    </None>
+    <None Update="ShaderAssembly\ps_float4_constant.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\vs_constant.fx">
+    </None>
+    <None Update="ShaderAssembly\ps_float4_construct.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="CompiledShaders\ps_clip.fxc">
+    </None>
+    <None Update="ShaderAssembly\ps_float4_construct2.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_conditional.fxc">
+    <None Update="ShaderAssembly\ps_multiply_subtract.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_constant_struct.fxc">
+    <None Update="ShaderAssembly\ps_negate_absolute.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_constant.fxc">
+    <None Update="ShaderAssembly\ps_tex2d.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_float4_construct2.fxc">
+    <None Update="ShaderAssembly\ps_tex2d_swizzle.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_tex2d_two_samplers.fxc">
+    <None Update="ShaderAssembly\ps_tex2d_two_samplers.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_tex2d_swizzle.fxc">
+    <None Update="ShaderAssembly\ps_texcoord.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_tex2d.fxc">
+    <None Update="ShaderAssembly\ps_texcoord_modifier.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_texcoord.fxc">
+    <None Update="ShaderAssembly\ps_texcoord_swizzle.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_float4_construct.fxc">
+    <None Update="ShaderAssembly\vs_constant.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_float4_constant.fxc">
+    <None Update="ShaderAssembly\vs_constant_struct.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_texcoord_swizzle.fxc">
+    <None Update="ShaderAssembly\vs_dot_product.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_texcoord_modifier.fxc">
+    <None Update="ShaderAssembly\vs_length.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_multiply_subtract.fxc">
+    <None Update="ShaderAssembly\vs_matrix22_vector2_multiply.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_absolute_multiply.fxc">
+    <None Update="ShaderAssembly\vs_matrix23_vector2_multiply.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_negate_absolute.fxc">
+    <None Update="ShaderAssembly\vs_matrix33_vector3_multiply.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\ps_dot_product2_add.fxc">
+    <None Update="ShaderAssembly\vs_matrix44_vector4_multiply.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_matrix23_vector2_multiply.fxc">
+    <None Update="ShaderAssembly\vs_normalize.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_normalize.fxc">
+    <None Update="ShaderAssembly\vs_submatrix43_vector3_multiply.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_length.fxc">
+    <None Update="ShaderAssembly\vs_vector2_matrix22_multiply.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_dot_product.fxc">
+    <None Update="ShaderAssembly\vs_vector2_matrix32_multiply.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_matrix44_vector4_multiply.fxc">
+    <None Update="ShaderAssembly\vs_vector3_matrix33_multiply.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_matrix33_vector3_multiply.fxc">
+    <None Update="ShaderAssembly\vs_vector4_matrix44_multiply.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_submatrix43_vector3_multiply.fxc">
+    <None Update="ShaderSources\ps_absolute_multiply.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_vector2_matrix32_multiply.fxc">
+    <None Update="ShaderSources\ps_clip.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_vector4_matrix44_multiply.fxc">
+    <None Update="ShaderSources\ps_conditional.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_vector3_matrix33_multiply.fxc">
+    <None Update="ShaderSources\ps_constant.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_vector2_matrix22_multiply.fxc">
+    <None Update="ShaderSources\ps_constant_struct.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_matrix22_vector2_multiply.fxc">
+    <None Update="ShaderSources\ps_dot_product2_add.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_constant_struct.fxc">
+    <None Update="ShaderSources\ps_float4_constant.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CompiledShaders\vs_constant.fxc">
+    <None Update="ShaderSources\ps_float4_construct.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
-    <Content Include="ShaderAssembly\ps_tex2d_two_samplers.asm">
+    <None Update="ShaderSources\ps_float4_construct2.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_tex2d_swizzle.asm">
+    </None>
+    <None Update="ShaderSources\ps_multiply_negate.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_negate_absolute.fx">
+    </None>
+    <None Update="ShaderSources\ps_multiply_subtract.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_negate_absolute.asm">
+    </None>
+    <None Update="ShaderSources\ps_negate_absolute.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_tex2d.fx">
+    </None>
+    <None Update="ShaderSources\ps_tex2d.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_tex2d_two_samplers.fx">
+    </None>
+    <None Update="ShaderSources\ps_tex2d_swizzle.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_tex2d_swizzle.fx">
+    </None>
+    <None Update="ShaderSources\ps_tex2d_two_samplers.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_tex2d.asm">
+    </None>
+    <None Update="ShaderSources\ps_texcoord.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\HlslDecompiler.csproj">
-      <Project>{0580d991-fd83-4b26-9ed0-90843c663cb9}</Project>
-      <Name>HlslDecompiler</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="ShaderAssembly\ps_constant.asm">
+    </None>
+    <None Update="ShaderSources\ps_texcoord_modifier.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_texcoord.asm">
+    </None>
+    <None Update="ShaderSources\ps_texcoord_swizzle.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_float4_construct.asm">
+    </None>
+    <None Update="ShaderSources\vs_constant.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_float4_constant.asm">
+    </None>
+    <None Update="ShaderSources\vs_constant_struct.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_texcoord_swizzle.asm">
+    </None>
+    <None Update="ShaderSources\vs_dot_product.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_texcoord_modifier.asm">
+    </None>
+    <None Update="ShaderSources\vs_length.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_multiply_subtract.asm">
+    </None>
+    <None Update="ShaderSources\vs_matrix22_vector2_multiply.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderAssembly\ps_absolute_multiply.asm">
+    </None>
+    <None Update="ShaderSources\vs_matrix23_vector2_multiply.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_constant.fx">
+    </None>
+    <None Update="ShaderSources\vs_matrix33_vector3_multiply.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_texcoord.fx">
+    </None>
+    <None Update="ShaderSources\vs_matrix44_vector4_multiply.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_float4_construct.fx">
+    </None>
+    <None Update="ShaderSources\vs_normalize.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_float4_constant.fx">
+    </None>
+    <None Update="ShaderSources\vs_submatrix43_vector3_multiply.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_texcoord_swizzle.fx">
+    </None>
+    <None Update="ShaderSources\vs_vector2_matrix22_multiply.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_texcoord_modifier.fx">
+    </None>
+    <None Update="ShaderSources\vs_vector2_matrix32_multiply.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_multiply_subtract.fx">
+    </None>
+    <None Update="ShaderSources\vs_vector3_matrix33_multiply.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ShaderSources\ps_absolute_multiply.fx">
+    </None>
+    <None Update="ShaderSources\vs_vector4_matrix44_multiply.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    </None>
   </ItemGroup>
-  <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>
\ No newline at end of file
+
+</Project>
diff --git a/HlslDecompiler.Tests/Properties/AssemblyInfo.cs b/HlslDecompiler.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 5f709f1..0000000
--- a/HlslDecompiler.Tests/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("HlslDecompiler.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("HlslDecompiler.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[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("e4c9890b-e6ee-4e7f-b8ba-e036a8cf6383")]
-
-// 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")]
diff --git a/HlslDecompiler.Tests/packages.config b/HlslDecompiler.Tests/packages.config
deleted file mode 100644
index 1363487..0000000
--- a/HlslDecompiler.Tests/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnitTestAdapter.WithFramework" version="2.0.0" targetFramework="net46" />
-</packages>
\ No newline at end of file
diff --git a/HlslDecompiler.csproj b/HlslDecompiler.csproj
index 5446d30..9582c38 100644
--- a/HlslDecompiler.csproj
+++ b/HlslDecompiler.csproj
@@ -1,165 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" 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>{0580D991-FD83-4B26-9ED0-90843C663CB9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HlslDecompiler</RootNamespace>
-    <AssemblyName>HlslDecompiler</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </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.Xml" />
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="CommandLineOptions.cs" />
-    <Compile Include="DirectXShaderModel\ParamRelativeCollection.cs" />
-    <Compile Include="DirectXShaderModel\ParamCollection.cs" />
-    <Compile Include="Hlsl\Compiler\ConstantIntRegister.cs" />
-    <Compile Include="Hlsl\Compiler\ConstantRegister.cs" />
-    <Compile Include="Hlsl\HlslSimpleWriter.cs" />
-    <Compile Include="Hlsl\HlslAstWriter.cs" />
-    <Compile Include="Hlsl\InstructionParser.cs" />
-    <Compile Include="DirectXShaderModel\Declaration.cs" />
-    <Compile Include="DirectXShaderModel\Reader\FormatDetector.cs" />
-    <Compile Include="DirectXShaderModel\DeclUsage.cs" />
-    <Compile Include="DirectXShaderModel\Opcode.cs" />
-    <Compile Include="DirectXShaderModel\ParameterClass.cs" />
-    <Compile Include="DirectXShaderModel\ParameterType.cs" />
-    <Compile Include="DirectXShaderModel\RegisterSet.cs" />
-    <Compile Include="DirectXShaderModel\RegisterType.cs" />
-    <Compile Include="DirectXShaderModel\ResultModifier.cs" />
-    <Compile Include="DirectXShaderModel\SamplerTextureType.cs" />
-    <Compile Include="DirectXShaderModel\SourceModifier.cs" />
-    <Compile Include="FourCC.cs" />
-    <Compile Include="Hlsl\Compiler\ConstantCompiler.cs" />
-    <Compile Include="Hlsl\Compiler\AssociativityTester.cs" />
-    <Compile Include="Hlsl\Compiler\NormalizeGrouper.cs" />
-    <Compile Include="Hlsl\Compiler\MatrixMultiplicationCompiler.cs" />
-    <Compile Include="Hlsl\Compiler\MatrixMultiplicationGrouper.cs" />
-    <Compile Include="Hlsl\Compiler\NodeCompiler.cs" />
-    <Compile Include="Hlsl\Operations\CompareOperation.cs" />
-    <Compile Include="Hlsl\Operations\DotProductOperation.cs" />
-    <Compile Include="Hlsl\GroupNode.cs" />
-    <Compile Include="Hlsl\Operations\LinearInterpolateOperation.cs" />
-    <Compile Include="Hlsl\Operations\MaximumOperation.cs" />
-    <Compile Include="Hlsl\Operations\LengthOperation.cs" />
-    <Compile Include="Hlsl\Operations\MinimumOperation.cs" />
-    <Compile Include="Hlsl\Operations\DivisionOperation.cs" />
-    <Compile Include="Hlsl\Operations\PowerOperation.cs" />
-    <Compile Include="Hlsl\NormalizeOutputNode.cs" />
-    <Compile Include="Hlsl\Operations\SquareRootOperation.cs" />
-    <Compile Include="Hlsl\Operations\SignLessOperation.cs" />
-    <Compile Include="Hlsl\Operations\SignGreaterOrEqualOperation.cs" />
-    <Compile Include="Hlsl\Operations\ReciprocalSquareRootOperation.cs" />
-    <Compile Include="Hlsl\Operations\ReciprocalOperation.cs" />
-    <Compile Include="Hlsl\Operations\FractionalOperation.cs" />
-    <Compile Include="Hlsl\ConstantNode.cs" />
-    <Compile Include="Hlsl\HlslAst.cs" />
-    <Compile Include="Hlsl\HlslTreeNode.cs" />
-    <Compile Include="Hlsl\HlslWriter.cs" />
-    <Compile Include="Hlsl\Operations\CosineOperation.cs" />
-    <Compile Include="Hlsl\Operations\SineOperation.cs" />
-    <Compile Include="Hlsl\Compiler\RegisterState.cs" />
-    <Compile Include="Hlsl\Operations\ConsumerOperation.cs" />
-    <Compile Include="Hlsl\Operations\ClipOperation.cs" />
-    <Compile Include="Hlsl\TemplateMatch\LengthContext.cs" />
-    <Compile Include="Hlsl\TemplateMatch\LengthTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\DotProduct4Template.cs" />
-    <Compile Include="Hlsl\TemplateMatch\DotProduct3Template.cs" />
-    <Compile Include="Hlsl\TemplateMatch\DotProductContext.cs" />
-    <Compile Include="Hlsl\TemplateMatch\DotProduct2Template.cs" />
-    <Compile Include="Hlsl\TemplateMatch\IGroupContext.cs" />
-    <Compile Include="Hlsl\TemplateMatch\IGroupTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\MultiplyConstantsTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\AddNegateTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\AddSelfTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\AddConstantsTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\AddZeroTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\AddNegativeTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\MultiplyNegativeOneTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\MultiplyConstantTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\MultiplyOneTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\MultiplyReciprocalDivisionTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\MultiplyZeroTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\NegateNegateTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\NegateConstantTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\NodeTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\MoveTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\MultiplyAddTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\INodeTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\ReciprocalSquareRootTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\ReciprocalReciprocalSquareRootTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\SubtractNegateTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\SubtractZeroTemplate.cs" />
-    <Compile Include="Hlsl\TemplateMatch\TemplateMatcher.cs" />
-    <Compile Include="IHasComponentIndex.cs" />
-    <Compile Include="Hlsl\Operations\MoveOperation.cs" />
-    <Compile Include="Hlsl\Operations\AbsoluteOperation.cs" />
-    <Compile Include="Hlsl\Operations\AddOperation.cs" />
-    <Compile Include="Hlsl\Operations\MultiplyAddOperation.cs" />
-    <Compile Include="Hlsl\Operations\MultiplyOperation.cs" />
-    <Compile Include="Hlsl\Operations\NegateOperation.cs" />
-    <Compile Include="Hlsl\Operations\Operation.cs" />
-    <Compile Include="Hlsl\RegisterInputNode.cs" />
-    <Compile Include="Hlsl\Operations\SubtractOperation.cs" />
-    <Compile Include="Hlsl\TextureLoadOutputNode.cs" />
-    <Compile Include="DirectXShaderModel\Instruction.cs" />
-    <Compile Include="DirectXShaderModel\InstructionVerifier.cs" />
-    <Compile Include="Hlsl\Compiler\NodeGrouper.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DirectXShaderModel\RegisterKey.cs" />
-    <Compile Include="DirectXShaderModel\RegisterComponentKey.cs" />
-    <Compile Include="DirectXShaderModel\Reader\RgxaReader.cs" />
-    <Compile Include="DirectXShaderModel\ShaderFlags.cs" />
-    <Compile Include="DirectXShaderModel\ShaderModel.cs" />
-    <Compile Include="DirectXShaderModel\ShaderType.cs" />
-    <Compile Include="DirectXShaderModel\Reader\ShaderReader.cs" />
-    <Compile Include="DirectXShaderModel\AsmWriter.cs" />
+    <Compile Remove="HlslDecompiler.Tests\**" />
+    <EmbeddedResource Remove="HlslDecompiler.Tests\**" />
+    <None Remove="HlslDecompiler.Tests\**" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="app.config" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
   </ItemGroup>
-  <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>
\ No newline at end of file
+
+</Project>
diff --git a/HlslDecompiler.sln b/HlslDecompiler.sln
index f7083a5..b786f9b 100644
--- a/HlslDecompiler.sln
+++ b/HlslDecompiler.sln
@@ -1,11 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2042
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30907.101
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HlslDecompiler", "HlslDecompiler.csproj", "{0580D991-FD83-4B26-9ED0-90843C663CB9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HlslDecompiler", "HlslDecompiler.csproj", "{C1129092-9D43-4F51-BA6E-7EA7F03AA139}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HlslDecompiler.Tests", "HlslDecompiler.Tests\HlslDecompiler.Tests.csproj", "{E4C9890B-E6EE-4E7F-B8BA-E036A8CF6383}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HlslDecompiler.Tests", "HlslDecompiler.Tests\HlslDecompiler.Tests.csproj", "{B1962B56-4EFD-4025-B831-C6E8FA82C9CA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C1129092-9D43-4F51-BA6E-7EA7F03AA139} = {C1129092-9D43-4F51-BA6E-7EA7F03AA139}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,19 +16,19 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0580D991-FD83-4B26-9ED0-90843C663CB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0580D991-FD83-4B26-9ED0-90843C663CB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0580D991-FD83-4B26-9ED0-90843C663CB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0580D991-FD83-4B26-9ED0-90843C663CB9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E4C9890B-E6EE-4E7F-B8BA-E036A8CF6383}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4C9890B-E6EE-4E7F-B8BA-E036A8CF6383}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4C9890B-E6EE-4E7F-B8BA-E036A8CF6383}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E4C9890B-E6EE-4E7F-B8BA-E036A8CF6383}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1129092-9D43-4F51-BA6E-7EA7F03AA139}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1129092-9D43-4F51-BA6E-7EA7F03AA139}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1129092-9D43-4F51-BA6E-7EA7F03AA139}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1129092-9D43-4F51-BA6E-7EA7F03AA139}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1962B56-4EFD-4025-B831-C6E8FA82C9CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1962B56-4EFD-4025-B831-C6E8FA82C9CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1962B56-4EFD-4025-B831-C6E8FA82C9CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1962B56-4EFD-4025-B831-C6E8FA82C9CA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {898814DC-1244-4FBC-8574-4F1D2AF65866}
+		SolutionGuid = {A4565287-E0EF-4092-B8E9-FA3F181D6F0A}
 	EndGlobalSection
 EndGlobal
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
deleted file mode 100644
index 1d3c7ed..0000000
--- a/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("ShaderDisasm")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ShaderDisasm")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[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("0580d991-fd83-4b26-9ed0-90843c663cb9")]
-
-// 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")]
diff --git a/app.config b/app.config
deleted file mode 100644
index d405098..0000000
--- a/app.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>