Skip to content

Commit 9cd3598

Browse files
authored
Fix fast up to date check (ClearFoundry#211)
* Remove non-existent folders These folders don't actually exist on disk. They are added automatically to the tree for linked items, but listing them explicitly in the project when they don't exist on disk causes them to be shown with error overlays in VS 16.9. * Use consistent target frameworks This works around an issue that can cause VS to needlessly rebuild these two projects.
1 parent 738409d commit 9cd3598

File tree

12 files changed

+2
-65
lines changed

12 files changed

+2
-65
lines changed

NetCore/ClearScript.Core/ClearScript.Core.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,6 @@
162162
<Compile Include="..\..\ClearScript\VoidResult.cs" Link="VoidResult.cs" />
163163
</ItemGroup>
164164

165-
<ItemGroup>
166-
<Folder Include="JavaScript\" />
167-
<Folder Include="Properties\" />
168-
<Folder Include="Util\COM\" />
169-
<Folder Include="Util\Test\" />
170-
<Folder Include="Util\Web\" />
171-
</ItemGroup>
172-
173165
<ItemGroup>
174166
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
175167
</ItemGroup>

NetCore/ClearScript.V8/ClearScript.V8.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@
7272
<Compile Include="..\..\ClearScript\V8\V8TestProxy.cs" Link="V8\V8TestProxy.cs" />
7373
</ItemGroup>
7474

75-
<ItemGroup>
76-
<Folder Include="Properties\" />
77-
<Folder Include="V8\" />
78-
<Folder Include="V8\SplitProxy\" />
79-
</ItemGroup>
80-
8175
<ItemGroup>
8276
<None Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' And ('$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='X86' Or '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='X64')" Include="..\..\bin\$(Configuration)\ClearScriptV8.win-x86.dll" Link="ClearScriptV8.win-x86.dll">
8377
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

NetCore/ClearScript.Windows/ClearScript.Windows.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@
5252
<Compile Include="..\..\ClearScript\Windows\WindowsScriptItem.cs" Link="Windows\WindowsScriptItem.cs" />
5353
</ItemGroup>
5454

55-
<ItemGroup>
56-
<Folder Include="Properties\" />
57-
<Folder Include="Windows\" />
58-
</ItemGroup>
59-
6055
<ItemGroup>
6156
<ProjectReference Include="..\ClearScript.Core\ClearScript.Core.csproj" />
6257
</ItemGroup>

NetCore/ClearScriptBenchmarks/ClearScriptBenchmarks.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
<Compile Include="..\..\ClearScriptBenchmarks\SunSpider.cs" Link="SunSpider.cs" />
2626
</ItemGroup>
2727

28-
<ItemGroup>
29-
<Folder Include="Properties\" />
30-
</ItemGroup>
31-
3228
<ItemGroup>
3329
<ProjectReference Include="..\ClearScript.Core\ClearScript.Core.csproj" />
3430
<ProjectReference Include="..\ClearScript.V8\ClearScript.V8.csproj" />

NetCore/ClearScriptConsole/ClearScriptConsole.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
<Compile Include="..\..\ClearScriptConsole\Properties\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
3030
</ItemGroup>
3131

32-
<ItemGroup>
33-
<Folder Include="Properties\" />
34-
</ItemGroup>
35-
3632
<ItemGroup>
3733
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
3834
</ItemGroup>

NetCore/ClearScriptTest/ClearScriptTest.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,6 @@
233233
</None>
234234
</ItemGroup>
235235

236-
<ItemGroup>
237-
<Folder Include="Properties\" />
238-
</ItemGroup>
239-
240236
<ItemGroup>
241237
<ProjectReference Include="..\ClearScript.Core\ClearScript.Core.csproj" />
242238
<ProjectReference Include="..\ClearScript.V8\ClearScript.V8.csproj" />

NetFramework/ClearScript.Core/ClearScript.Core.csproj

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,6 @@
166166
<Compile Include="..\..\ClearScript\VoidResult.cs" Link="VoidResult.cs" />
167167
</ItemGroup>
168168

169-
<ItemGroup>
170-
<Folder Include="Exports\" />
171-
<Folder Include="JavaScript\" />
172-
<Folder Include="Properties\" />
173-
<Folder Include="Util\COM\" />
174-
<Folder Include="Util\Test\" />
175-
<Folder Include="Util\Web\" />
176-
</ItemGroup>
177-
178169
<ItemGroup>
179170
<None Include="..\..\ClearScript\DelegateFactory.tt" Link="DelegateFactory.tt">
180171
<Generator>TextTemplatingFileGenerator</Generator>

NetFramework/ClearScript.V8/ClearScript.V8.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@
8080
<Compile Include="..\..\ClearScript\V8\V8TestProxy.cs" Link="V8\V8TestProxy.cs" />
8181
</ItemGroup>
8282

83-
<ItemGroup>
84-
<Folder Include="Properties\" />
85-
<Folder Include="V8\" />
86-
<Folder Include="V8\SplitProxy\" />
87-
</ItemGroup>
88-
8983
<ItemGroup>
9084
<None Include="..\..\ClearScript\Properties\AssemblyInfo.V8.tt" Link="Properties\AssemblyInfo.V8.tt">
9185
<Generator>TextTemplatingFileGenerator</Generator>

NetFramework/ClearScript.Windows/ClearScript.Windows.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@
5454
<Compile Include="..\..\ClearScript\Windows\WindowsScriptItem.cs" Link="Windows\WindowsScriptItem.cs" />
5555
</ItemGroup>
5656

57-
<ItemGroup>
58-
<Folder Include="Properties\" />
59-
<Folder Include="Windows\" />
60-
</ItemGroup>
61-
6257
<ItemGroup>
6358
<None Include="..\..\ClearScript\Properties\AssemblyInfo.Windows.tt" Link="Properties\AssemblyInfo.Windows.tt">
6459
<Generator>TextTemplatingFileGenerator</Generator>

NetFramework/ClearScriptBenchmarks/ClearScriptBenchmarks.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net471</TargetFramework>
5+
<TargetFrameworks>net45;net471</TargetFrameworks>
66
<RootNamespace>Microsoft.ClearScript.Test</RootNamespace>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
</PropertyGroup>
@@ -31,10 +31,6 @@
3131
<Compile Include="..\..\ClearScriptBenchmarks\SunSpider.cs" Link="SunSpider.cs" />
3232
</ItemGroup>
3333

34-
<ItemGroup>
35-
<Folder Include="Properties\" />
36-
</ItemGroup>
37-
3834
<ItemGroup>
3935
<None Include="..\..\ClearScriptBenchmarks\Properties\AssemblyInfo.tt" Link="Properties\AssemblyInfo.tt">
4036
<Generator>TextTemplatingFileGenerator</Generator>

0 commit comments

Comments
 (0)