Skip to content

Upgraded reference to net48 instead of net4.8 to avoid unexpected beh… #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IgnacyPawlak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgraded reference to net48 instead of net4.8 to avoid unexpected beh… #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions WebCompiler.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/WebCompiler/MSBuild/BuildWebCompiler2022.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_WebCompilerTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">..\tools\netstandard2.1\WebCompiler.dll</_WebCompilerTaskAssembly>
<_WebCompilerTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">..\tools\net4.8\WebCompiler.exe</_WebCompilerTaskAssembly>
<_WebCompilerTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">..\tools\net48\WebCompiler.exe</_WebCompilerTaskAssembly>
</PropertyGroup>

<UsingTask AssemblyFile="$(_WebCompilerTaskAssembly)" TaskName="WebCompiler.CompilerBuildTask"/>
Expand Down
90 changes: 45 additions & 45 deletions src/WebCompiler/WebCompiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\common.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net4.8;netstandard2.1;netcoreapp3.1</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Title>Web Compiler</Title>
<PackageId>BuildWebCompiler2022</PackageId>
<Import Project="..\common.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net48;netstandard2.1;netcoreapp3.1</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Title>Web Compiler</Title>
<PackageId>BuildWebCompiler2022</PackageId>

<BuildOutputTargetFolder>tools</BuildOutputTargetFolder>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<NoPackageAnalysis>true</NoPackageAnalysis>
<!-- forces SDK to copy dependencies into build output to make packing easier -->
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<Authors>Jason Moore</Authors>
<RepositoryUrl>https://github.com/failwyn/WebCompiler</RepositoryUrl>
<Version>1.14.10</Version>
<BuildOutputTargetFolder>tools</BuildOutputTargetFolder>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<NoPackageAnalysis>true</NoPackageAnalysis>
<!-- forces SDK to copy dependencies into build output to make packing easier -->
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<Authors>Jason Moore</Authors>
<RepositoryUrl>https://github.com/failwyn/WebCompiler</RepositoryUrl>
<Version>1.14.10</Version>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Node\prepare.cmd" />
<EmbeddedResource Include="Node\node.7z" />
<EmbeddedResource Include="Node\node_modules.7z" />
<EmbeddedResource Include="Node\7z.dll" />
<EmbeddedResource Include="Node\7z.exe" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework" Version="17.4.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.4.0" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" PrivateAssets="All" />
<PackageReference Include="NUglify" Version="1.20.4" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Content Include="MSBuild\*.targets" PackagePath="build\" />
</ItemGroup>
<Target Name="PrepareNpmDependencies" AfterTargets="Restore">
<Exec Command="..\..\build\build.cmd" />
</Target>
<Target Name="PackTaskDependencies" BeforeTargets="GenerateNuspec">
<!--
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Node\prepare.cmd" />
<EmbeddedResource Include="Node\node.7z" />
<EmbeddedResource Include="Node\node_modules.7z" />
<EmbeddedResource Include="Node\7z.dll" />
<EmbeddedResource Include="Node\7z.exe" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework" Version="17.4.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.4.0" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" PrivateAssets="All" />
<PackageReference Include="NUglify" Version="1.20.4" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Content Include="MSBuild\*.targets" PackagePath="build\" />
</ItemGroup>
<Target Name="PrepareNpmDependencies" AfterTargets="Restore">
<Exec Command="..\..\build\build.cmd" />
</Target>
<Target Name="PackTaskDependencies" BeforeTargets="GenerateNuspec">
<!--
The include needs to happen after output has been copied to build output folder
but before NuGet generates a nuspec. See https://github.com/NuGet/Home/issues/4704.
-->
<ItemGroup>
<_PackageFiles Include="bin\$(Configuration)\*\Newtonsoft.Json.dll;bin\$(Configuration)\*\NUglify.dll">
<PackagePath>tools\%(RecursiveDir)</PackagePath>
<Visible>false</Visible>
<BuildAction>Content</BuildAction>
</_PackageFiles>
</ItemGroup>
</Target>
<ItemGroup>
<_PackageFiles Include="bin\$(Configuration)\*\Newtonsoft.Json.dll;bin\$(Configuration)\*\NUglify.dll">
<PackagePath>tools\%(RecursiveDir)</PackagePath>
<Visible>false</Visible>
<BuildAction>Content</BuildAction>
</_PackageFiles>
</ItemGroup>
</Target>
</Project>
1 change: 0 additions & 1 deletion src/WebCompilerTest/WebCompilerTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@
<Name>WebCompiler</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
<ItemGroup>
Expand Down
15 changes: 7 additions & 8 deletions src/WebCompilerVsix/WebCompilerVsix.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<Link>Resources\LICENSE</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\WebCompiler\bin\$(Configuration)\net4.8\WebCompiler.pdb">
<Content Include="..\WebCompiler\bin\$(Configuration)\net48\WebCompiler.pdb">
<Link>WebCompiler.pdb</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
Expand Down Expand Up @@ -155,13 +155,6 @@
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WebCompiler\WebCompiler.csproj">
<Project>{b714b5b9-27c4-443c-9517-fe5c5ef46ea2}</Project>
<Name>WebCompiler</Name>
<AdditionalProperties>TargetFramework=net4.8</AdditionalProperties>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.SDK">
<Version>17.0.31902.203</Version>
Expand All @@ -184,6 +177,12 @@
<Version>1.20.4</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WebCompiler\WebCompiler.csproj">
<Project>{b714b5b9-27c4-443c-9517-fe5c5ef46ea2}</Project>
<Name>WebCompiler</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
<ProjectExtensions />
Expand Down