diff --git a/.gitignore b/.gitignore index 80692d44..88ff2ea5 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ _NCrunch_WebCompiler#Node src/WebCompiler/Node/node_modules/* /src/WebCompiler/Node/node.exe /src/WebCompiler/Node/package-lock.json +/src/WebCompiler/Node/package.json diff --git a/WebCompiler.sln b/WebCompiler.sln index c3380f98..b183664c 100644 --- a/WebCompiler.sln +++ b/WebCompiler.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34525.116 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebCompilerVsix", "src\WebCompilerVsix\WebCompilerVsix.csproj", "{49C270BE-9645-40D5-BE08-91ADE243D394}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebCompiler", "src\WebCompiler\WebCompiler.csproj", "{B714B5B9-27C4-443C-9517-FE5C5EF46EA2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebCompiler", "src\WebCompiler\WebCompiler.csproj", "{B714B5B9-27C4-443C-9517-FE5C5EF46EA2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebCompilerTest", "src\WebCompilerTest\WebCompilerTest.csproj", "{43AAA3AD-A806-45A0-99A3-F0E7E3B81AEB}" EndProject diff --git a/src/WebCompiler/MSBuild/BuildWebCompiler2022.targets b/src/WebCompiler/MSBuild/BuildWebCompiler2022.targets index e2484bd8..f120a7a7 100644 --- a/src/WebCompiler/MSBuild/BuildWebCompiler2022.targets +++ b/src/WebCompiler/MSBuild/BuildWebCompiler2022.targets @@ -2,7 +2,7 @@ <_WebCompilerTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">..\tools\netstandard2.1\WebCompiler.dll - <_WebCompilerTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">..\tools\net4.8\WebCompiler.exe + <_WebCompilerTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">..\tools\net48\WebCompiler.exe diff --git a/src/WebCompiler/WebCompiler.csproj b/src/WebCompiler/WebCompiler.csproj index d9f67426..fb3216a8 100644 --- a/src/WebCompiler/WebCompiler.csproj +++ b/src/WebCompiler/WebCompiler.csproj @@ -1,52 +1,52 @@ - - - Exe - net4.8;netstandard2.1;netcoreapp3.1 - latest - Web Compiler - BuildWebCompiler2022 + + + Exe + net48;netstandard2.1;netcoreapp3.1 + latest + Web Compiler + BuildWebCompiler2022 - tools - false - true - - true - Jason Moore - https://github.com/failwyn/WebCompiler - 1.14.10 + tools + false + true + + true + Jason Moore + https://github.com/failwyn/WebCompiler + 1.14.10 True - - - - - - - - - - - - - - - - - - - - - - - - <_PackageFiles Include="bin\$(Configuration)\*\Newtonsoft.Json.dll;bin\$(Configuration)\*\NUglify.dll"> - tools\%(RecursiveDir) - false - Content - - - + + <_PackageFiles Include="bin\$(Configuration)\*\Newtonsoft.Json.dll;bin\$(Configuration)\*\NUglify.dll"> + tools\%(RecursiveDir) + false + Content + + + \ No newline at end of file diff --git a/src/WebCompilerTest/WebCompilerTest.csproj b/src/WebCompilerTest/WebCompilerTest.csproj index 2e49c96f..0899024d 100644 --- a/src/WebCompilerTest/WebCompilerTest.csproj +++ b/src/WebCompilerTest/WebCompilerTest.csproj @@ -175,7 +175,6 @@ WebCompiler - diff --git a/src/WebCompilerVsix/WebCompilerVsix.csproj b/src/WebCompilerVsix/WebCompilerVsix.csproj index 759252fa..e913d888 100644 --- a/src/WebCompilerVsix/WebCompilerVsix.csproj +++ b/src/WebCompilerVsix/WebCompilerVsix.csproj @@ -92,7 +92,7 @@ Resources\LICENSE true - + WebCompiler.pdb true @@ -155,13 +155,6 @@ - - - {b714b5b9-27c4-443c-9517-fe5c5ef46ea2} - WebCompiler - TargetFramework=net4.8 - - 17.0.31902.203 @@ -184,6 +177,12 @@ 1.20.4 + + + {b714b5b9-27c4-443c-9517-fe5c5ef46ea2} + WebCompiler + +