Skip to content

Commit 4853293

Browse files
KevinRansomKevinRansom
authored
Merge pull request #1425 from Microsoft/preview4
WIP: make oss build work with preview4
2 parents 6ca796c + feab056 commit 4853293

File tree

13 files changed

+120
-58
lines changed

13 files changed

+120
-58
lines changed

‎build-everything.proj‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,34 +40,34 @@
4040
<ItemGroup Condition="'$(BUILD_SETUP)'=='1' or '$(BUILD_ALL)'=='1'">
4141
<SetupProjects Include="setup/fsharp-setup-build.proj" />
4242
</ItemGroup>
43-
43+
4444
<Target Name="Build">
45-
<MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
46-
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable7" />
47-
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable47" />
48-
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable78" />
49-
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable259" />
50-
<MSBuild Projects="@(ProjectsWithCoreClr)" Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
51-
<MSBuild Projects="@(SetupProjects)" Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration)" />
45+
<MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);SIGNTYPE=$(SIGNTYPE)" />
46+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable7;SIGNTYPE=$(SIGNTYPE)" />
47+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable47;SIGNTYPE=$(SIGNTYPE)" />
48+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable78;SIGNTYPE=$(SIGNTYPE)" />
49+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable259;SIGNTYPE=$(SIGNTYPE)" />
50+
<MSBuild Projects="@(ProjectsWithCoreClr)" Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr;SIGNTYPE=$(SIGNTYPE)" />
51+
<MSBuild Projects="@(SetupProjects)" Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);SIGNTYPE=$(SIGNTYPE)" />
5252
</Target>
5353

5454
<Target Name="Rebuild">
55-
<MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
56-
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable7" />
57-
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable47" />
58-
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable78" />
59-
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable259" />
60-
<MSBuild Projects="@(ProjectsWithCoreClr)" Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
61-
<MSBuild Projects="@(SetupProjects)" Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration)" />
55+
<MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);SIGNTYPE=$(SIGNTYPE)" />
56+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable7;SIGNTYPE=$(SIGNTYPE)" />
57+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable47;SIGNTYPE=$(SIGNTYPE)" />
58+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable78;SIGNTYPE=$(SIGNTYPE)" />
59+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable259;SIGNTYPE=$(SIGNTYPE)" />
60+
<MSBuild Projects="@(ProjectsWithCoreClr)" Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr;SIGNTYPE=$(SIGNTYPE)" />
61+
<MSBuild Projects="@(SetupProjects)" Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);SIGNTYPE=$(SIGNTYPE)" />
6262
</Target>
6363

6464
<Target Name="Clean">
65-
<MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
66-
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable7" />
67-
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable47" />
68-
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable78" />
69-
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable259" />
70-
<MSBuild Projects="@(ProjectsWithCoreClr)" Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
71-
<MSBuild Projects="@(SetupProjects)" Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration)" />
65+
<MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);SIGNTYPE=$(SIGNTYPE)" />
66+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable7;SIGNTYPE=$(SIGNTYPE)" />
67+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable47;SIGNTYPE=$(SIGNTYPE)" />
68+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable78;SIGNTYPE=$(SIGNTYPE)" />
69+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable259;SIGNTYPE=$(SIGNTYPE)" />
70+
<MSBuild Projects="@(ProjectsWithCoreClr)" Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr;SIGNTYPE=$(SIGNTYPE)" />
71+
<MSBuild Projects="@(SetupProjects)" Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);SIGNTYPE=$(SIGNTYPE)" />
7272
</Target>
7373
</Project>

‎build.cmd‎

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo.
1414
echo Usage:
1515
echo.
1616
echo build.cmd ^<all^|proto^|protofx^|build^|debug^|release^|diag^|compiler^|coreclr^|pcls^|vs^|ci^|ci_part1^|ci_part2^|microbuild^>
17-
echo ^<test-coreunit^|test-corecompile^|test-smoke^|test-coreclr^|test-pcls^|test-fsharp^|test-fsharpqa^|test-vs^>
17+
echo ^<test-coreunit^|test-corecompile^|test-smoke^|test-coreclr^|test-pcls^|test-fsharp^|test-fsharpqa^|test-vs^|publicsign^>
1818
echo.
1919
echo No arguments default to 'build'
2020
echo.
@@ -41,6 +41,7 @@ set BUILD_VS=0
4141
set BUILD_CONFIG=release
4242
set BUILD_CONFIG_LOWERCASE=release
4343
set BUILD_DIAG=
44+
set BUILD_PUBLICSIGN=0
4445

4546
set TEST_COMPILERUNIT=0
4647
set TEST_NET40_COREUNIT=0
@@ -260,6 +261,10 @@ if /i '%ARG%' == 'test-fsharp' (
260261
set TEST_FSHARP_SUITE=1
261262
)
262263

264+
if /i '%ARG%' == 'publicsign' (
265+
set BUILD_PUBLICSIGN=1
266+
)
267+
263268
goto :EOF
264269

265270
:MAIN
@@ -277,6 +282,7 @@ echo BUILD_VS=%BUILD_VS%
277282
echo BUILD_SETUP=%BUILD_SETUP%
278283
echo BUILD_CONFIG=%BUILD_CONFIG%
279284
echo BUILD_CONFIG_LOWERCASE=%BUILD_CONFIG_LOWERCASE%
285+
echo BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN%
280286
echo.
281287
echo TEST_COMPILERUNIT=%TEST_COMPILERUNIT%
282288
echo TEST_NET40_COREUNIT=%TEST_NET40_COREUNIT%
@@ -299,23 +305,40 @@ call src\update.cmd signonly
299305
:: Check prerequisites
300306
if not '%VisualStudioVersion%' == '' goto vsversionset
301307
if exist "%VS150COMNTOOLS%..\ide\devenv.exe" set VisualStudioVersion=15.0
302-
if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 15.0\common7\ide\devenv.exe" set VisualStudioVersion=15.0
303-
if exist "%ProgramFiles%\Microsoft Visual Studio 15.0\common7\ide\devenv.exe" set VisualStudioVersion=15.0
304308
if not '%VisualStudioVersion%' == '' goto vsversionset
309+
310+
if not '%VisualStudioVersion%' == '' goto vsversionset
311+
if exist "%VS150COMNTOOLS%..\..\ide\devenv.exe" set VisualStudioVersion=15.0
312+
if not '%VisualStudioVersion%' == '' goto vsversionset
313+
305314
if exist "%VS140COMNTOOLS%..\ide\devenv.exe" set VisualStudioVersion=14.0
306315
if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe" set VisualStudioVersion=14.0
307316
if exist "%ProgramFiles%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe" set VisualStudioVersion=14.0
308317
if not '%VisualStudioVersion%' == '' goto vsversionset
318+
309319
if exist "%VS120COMNTOOLS%..\ide\devenv.exe" set VisualStudioVersion=12.0
310320
if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe" set VisualStudioVersion=12.0
311321
if exist "%ProgramFiles%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe" set VisualStudioVersion=12.0
312322

313323
:vsversionset
314324
if '%VisualStudioVersion%' == '' echo Error: Could not find an installation of Visual Studio && goto :failure
315325

316-
if exist "%ProgramFiles(x86)%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe" set _msbuildexe="%ProgramFiles(x86)%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe"
317-
if exist "%ProgramFiles%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe" set _msbuildexe="%ProgramFiles%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe"
318-
if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe. && goto :failure
326+
if exist "%VS150COMNTOOLS%..\..\MSBuild\15.0\Bin\MSBuild.exe" (
327+
set _msbuildexe="%VS150COMNTOOLS%..\..\MSBuild\15.0\Bin\MSBuild.exe"
328+
goto :havemsbuild
329+
)
330+
if exist "%ProgramFiles(x86)%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe" (
331+
set _msbuildexe="%ProgramFiles(x86)%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe"
332+
goto :havemsbuild
333+
)
334+
if exist "%ProgramFiles%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe" (
335+
set _msbuildexe="%ProgramFiles%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe"
336+
goto :havemsbuild
337+
)
338+
echo Error: Could not find MSBuild.exe. && goto :failure
339+
goto :eof
340+
341+
:havemsbuild
319342
set _nrswitch=/nr:false
320343

321344
rem uncomment to use coreclr msbuild not ready yet!!!!
@@ -380,8 +403,8 @@ if '%BUILD_PROTO%' == '1' (
380403
@if ERRORLEVEL 1 echo Error: NGen of proto failed && goto :failure
381404
)
382405

383-
%_msbuildexe% %msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG% %BUILD_DIAG%
384-
@if ERRORLEVEL 1 echo Error: '%_msbuildexe% %msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG% %BUILD_DIAG%' failed && goto :failure
406+
%_msbuildexe% %msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG% %BUILD_DIAG% /p:SIGNTYPE=%BUILD_PUBLICSIGN%
407+
@if ERRORLEVEL 1 echo Error: '%_msbuildexe% %msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG% %BUILD_DIAG% /p:SIGNTYPE=%BUILD_PUBLICSIGN%' failed && goto :failure
385408

386409
@echo on
387410
call src\update.cmd %BUILD_CONFIG_LOWERCASE% -ngen

‎src/FSharpSource.targets‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<IsPortableProfile>true</IsPortableProfile>
2525
</PropertyGroup>
2626
<PropertyGroup>
27-
<OtherFlags Condition="'$(TargetFramework)' == 'coreclr'">$(OtherFlags) --delaysign+</OtherFlags>
28-
<OtherFlags Condition="'$(TargetFramework)' != 'coreclr'">$(OtherFlags) --publicsign+</OtherFlags>
27+
<OtherFlags Condition="'$(TargetFramework)' == 'coreclr' or $(SIGNTYPE) != '1'">$(OtherFlags) --delaysign+</OtherFlags>
28+
<OtherFlags Condition="'$(TargetFramework)' != 'coreclr' and $(SIGNTYPE) == '1'">$(OtherFlags) --publicsign+</OtherFlags>
2929
<OtherFlags>$(OtherFlags) --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"</OtherFlags>
3030
<DefineConstants>STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)</DefineConstants>
3131
<StrongNames>true</StrongNames>
@@ -35,8 +35,8 @@
3535
</When>
3636
<When Condition="'$(AssemblyName)' == 'FSharp.LanguageService' or '$(AssemblyName)' == 'FSharp.LanguageService.Compiler' or '$(AssemblyName)' == 'FSharp.Editor' or '$(AssemblyName)' == 'FSharp.VS.FSI' or '$(AssemblyName)' == 'FSharp.ProjectSystem.FSharp'">
3737
<PropertyGroup>
38-
<OtherFlags Condition="'$(TargetFramework)' == 'coreclr'">$(OtherFlags) --delaysign+</OtherFlags>
39-
<OtherFlags Condition="'$(TargetFramework)' != 'coreclr'">$(OtherFlags) --publicsign+</OtherFlags>
38+
<OtherFlags Condition="'$(TargetFramework)' == 'coreclr' or $(SIGNTYPE) != '1'">$(OtherFlags) --delaysign+</OtherFlags>
39+
<OtherFlags Condition="'$(TargetFramework)' != 'coreclr' and $(SIGNTYPE) == '1'">$(OtherFlags) --publicsign+</OtherFlags>
4040
<OtherFlags>$(OtherFlags) --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"</OtherFlags>
4141
<DefineConstants>STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)</DefineConstants>
4242
<StrongNames>true</StrongNames>
@@ -55,8 +55,8 @@
5555
</When>
5656
<Otherwise>
5757
<PropertyGroup Condition="'$(SIGN_WITH_MSFT_KEY)' == 'true'">
58-
<OtherFlags Condition="'$(TargetFramework)' == 'coreclr'">$(OtherFlags) --delaysign+</OtherFlags>
59-
<OtherFlags Condition="'$(TargetFramework)' != 'coreclr'">$(OtherFlags) --publicsign+</OtherFlags>
58+
<OtherFlags Condition="'$(TargetFramework)' == 'coreclr' or $(SIGNTYPE) != '1'">$(OtherFlags) --delaysign+</OtherFlags>
59+
<OtherFlags Condition="'$(TargetFramework)' != 'coreclr' and $(SIGNTYPE) == '1'">$(OtherFlags) --publicsign+</OtherFlags>
6060
<OtherFlags>$(OtherFlags) --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"</OtherFlags>
6161
<DefineConstants>STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)</DefineConstants>
6262
<StrongNames>true</StrongNames>

‎src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,7 @@
589589
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
590590
<Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
591591
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath></Reference>
592+
<Reference Include="System.ValueTuple"><HintPath>..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll</HintPath></Reference>
592593
<Reference Include="System.ValueTuple"><HintPath>..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\\System.ValueTuple.dll</HintPath></Reference>
593594
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >
594595
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>

‎src/update.cmd‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
@rem Version 2.0. See License.txt in the project root for license information.
55
@rem ===========================================================================================================
66

7-
87
if /i "%1" == "debug" goto :ok
98
if /i "%1" == "release" goto :ok
109
if /i "%1" == "signonly" goto :ok
@@ -19,20 +18,26 @@ exit /b 1
1918

2019
set BINDIR=%~dp0..\%1\net40\bin
2120

22-
if /i "%PROCESSOR_ARCHITECTURE%"=="x86" set X86_PROGRAMFILES=%ProgramFiles%
23-
if /I "%PROCESSOR_ARCHITECTURE%"=="AMD64" set X86_PROGRAMFILES=%ProgramFiles(x86)%
21+
if exist "%WindowsSDK_ExecutablePath_x64%" set WINSDKNETFXTOOLS_X64=%WindowsSDK_ExecutablePath_x64%
22+
if exist "%WindowsSDK_ExecutablePath_x86%" set WINSDKNETFXTOOLS_X86=%WindowsSDK_ExecutablePath_x86%
23+
24+
if not "%WindowsSDK_ExecutablePath_x86%" == "" goto :havesdk
2425

2526
set REGEXE32BIT=reg.exe
2627
if not "%OSARCH%"=="x86" set REGEXE32BIT=%WINDIR%\syswow64\reg.exe
2728

28-
FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B
29-
if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.1A\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B
30-
if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B
31-
if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B
32-
if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B
29+
FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS_x86=%%B
30+
if "%WINSDKNETFXTOOLS_x86%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.1A\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS_x86=%%B
31+
if "%WINSDKNETFXTOOLS_x86%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS_x86=%%B
32+
if "%WINSDKNETFXTOOLS_x86%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS_x86=%%B
33+
if "%WINSDKNETFXTOOLS_x86%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS_x86=%%B
34+
35+
set WINSDKNETFXTOOLS_x64=%WINSDKNETFXTOOLS_x86%x64\
36+
37+
:havesdk
38+
set SN32="%WINSDKNETFXTOOLS_x86%sn.exe"
39+
set SN64="%WINSDKNETFXTOOLS_x64%sn.exe"
3340

34-
set SN32="%WINSDKNETFXTOOLS%sn.exe"
35-
set SN64="%WINSDKNETFXTOOLS%x64\sn.exe"
3641
set NGEN32=%windir%\Microsoft.NET\Framework\v4.0.30319\ngen.exe
3742
set NGEN64=%windir%\Microsoft.NET\Framework64\v4.0.30319\ngen.exe
3843

@@ -68,8 +73,8 @@ if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
6873

6974
%SN64% -Vr fsc,b03f5f7f11d50a3a
7075
%SN64% -Vr fsi,b03f5f7f11d50a3a
71-
%SN64% -Vr FsiAnyCPU,b03f5f7f11d50a3a
72-
76+
%SN64% -Vr FsiAnyCPU,b03f5f7f11d50a3a
77+
7378
%SN64% -Vr FSharp.Compiler,b03f5f7f11d50a3a
7479
%SN64% -Vr FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a
7580
%SN64% -Vr FSharp.Editor,b03f5f7f11d50a3a

‎tests/.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FSharp_*
22
FSharpQA_*
33
CoreUnit_*
4-
TestResults
4+
TestResults
5+
*.il

0 commit comments

Comments
 (0)