Skip to content

Commit d1f13d3

Browse files
committed
Fix nuget_config and build nunit cambridge tests
1 parent e8f803b commit d1f13d3

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

.nuget/NuGet.Config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,10 @@
33
<solution>
44
<add key="disableSourceControlIntegration" value="true" />
55
</solution>
6+
<packageSources>
7+
<add key="myget.org dotnet-corefx" value="https://www.myget.org/F/dotnet-corefx/" />
8+
<add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/" />
9+
<add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/" />
10+
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
11+
</packageSources>
612
</configuration>

appveyor-build.cmd

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if defined APPVEYOR (
3131
set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
3232
if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :failure
3333

34-
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages
34+
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget\nuget.config
3535
@if ERRORLEVEL 1 echo Error: Nuget restore failed && goto :failure
3636

3737
:: Build
@@ -83,16 +83,21 @@ if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :failure
8383
%_msbuildexe% vsintegration\fsharp-vsintegration-unittests-build.proj /p:Configuration=Release
8484
@if ERRORLEVEL 1 echo Error: VS integration unit tests build failed && goto :failure
8585

86+
8687
@echo on
8788
call src\update.cmd release -ngen
89+
pushd tests
8890

8991
@echo on
90-
call tests\BuildTestTools.cmd release
91-
@if ERRORLEVEL 1 echo Error: 'tests\BuildTestTools.cmd release' failed && goto :failure
92+
call BuildTestTools.cmd release
93+
@if ERRORLEVEL 1 echo Error: 'BuildTestTools.cmd release' failed && goto :failure
9294

9395
@echo on
94-
pushd tests
9596
set FSHARP_TEST_SUITE_USE_NUNIT_RUNNER=true
97+
98+
%_msbuildexe% fsharp\fsharp.tests.fsproj /p:Configuration=Release
99+
@if ERRORLEVEL 1 echo Error: fsharp cambridge tests for nunit failed && goto :failure
100+
96101
call RunTests.cmd release fsharp Smoke
97102
@if ERRORLEVEL 1 type testresults\fsharp_failures.log && echo Error: 'RunTests.cmd release fsharp Smoke' failed && goto :failure
98103
set FSHARP_TEST_SUITE_USE_NUNIT_RUNNER=

tests/RunTests.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
echo OFF
1+
@echo OFF
22
setlocal
33

44
set FLAVOR=%1

0 commit comments

Comments
 (0)