Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitea00c4b

Browse files
committed
Merge pull requestdotnet#218 from KevinRansom/VS2015Support
1. Revert AppVeyor to use Dev 12, until AppVeyor provide Pro support fo...
2 parentsd2433da +2747996 commitea00c4b

File tree

7 files changed

+33
-29
lines changed

7 files changed

+33
-29
lines changed

‎appveyor-build.cmd‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :eof
2929
%_ngenexe% install proto\net40\bin\FSharp.Build-proto.dll
3030
%_ngenexe% install proto\net40\bin\fsc-proto.exe
3131

32-
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:Configuration=Release
32+
%_msbuildexe% src/fsharp-library-build.proj /p:Configuration=Release
3333
@if ERRORLEVEL1echo Error: library release build failed&&goto :eof
3434

35-
%_msbuildexe% src/fsharp-compiler-build.proj /p:UseNugetPackages=true /p:Configuration=Release
35+
%_msbuildexe% src/fsharp-compiler-build.proj /p:Configuration=Release
3636
@if ERRORLEVEL1echo Error: compile Release build failed&&goto :eof
3737

3838
REM We don't build new net20 FSharp.Core anymore
@@ -68,6 +68,12 @@ REM @if ERRORLEVEL 1 echo Error: library net20 build failed && goto :eof
6868
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
6969
@if ERRORLEVEL1echo Error: library unittests build failed portable259&&goto :eof
7070

71+
%_msbuildexe% vsintegration\fsharp-vsintegration-build.proj /p:TargetFramework=net40 /p:Configuration=Release
72+
@if ERRORLEVEL1echo Error: library unittests build failed vsintegration-unittests&&goto :eof
73+
74+
%_msbuildexe% vsintegration\fsharp-vsintegration-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release
75+
@if ERRORLEVEL1echo Error: library unittests build failed vsintegration-unittests&&goto :eof
76+
7177
@echoon
7278
call src\update.cmd release -ngen
7379

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
os:Visual Studio 2015 CTP
1+
os:Windows Server 2012 R2
22

33
init:
44
build_script:

‎src/FSharpSource.targets‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -745,4 +745,11 @@
745745
<TargetName="BeforeBuild"BeforeTargets="Build">
746746
<ExecCommand=".\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages"WorkingDirectory="$(FSharpSourcesRoot)\.."/>
747747
</Target>
748+
749+
<TargetName="BeforeResolveReferences">
750+
<CreatePropertyValue="$(ProjectDir)..\..\..\packages\NUnit.2.6.3\lib\;$(ProjectDir)..\..\..\packages\NUnit.Runners.2.6.3\tools\lib\;$(AssemblySearchPaths)">
751+
<OutputTaskParameter="Value"
752+
PropertyName="AssemblySearchPaths" />
753+
</CreateProperty>
754+
</Target>
748755
</Project>

‎tests/BuildTestTools.cmd‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,23 @@ exit /b 1
1515

1616
:ok
1717

18+
:: Check prerequisites
19+
ifnot '%VisualStudioVersion%'== ''goto vsversionset
20+
ifexist"%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe"setVisualStudioVersion=14.0
21+
ifnot '%VisualStudioVersion%'== ''goto vsversionset
22+
ifexist"%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe"setVisualStudioVersion=12.0
23+
:vsversionset
24+
if '%VisualStudioVersion%'== ''echo Error: Could not find a Visual Studio Installed.MSBuild.exe. Please see http://www.visualstudio.com/en-us/news/vs2015-vs.aspx.&&goto :eof
25+
26+
if '%VisualStudioVersion%'=='14.0'set_msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
27+
if '%VisualStudioVersion%'=='12.0'set_msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
28+
ifnotexist%_msbuildexe%echo Error: Could not find MSBuild.exe. Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760.&&goto :eof
29+
1830
ifnotexist"%~dp0\fsharpqa\testenv\bin"mkdir"%~dp0\fsharpqa\testenv\bin"||goto :error
19-
msbuild%~dp0\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj /p:Configuration=%1 /t:Build||goto :error
31+
%_msbuildexe%%~dp0\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj /p:Configuration=%1 /t:Build||goto :error
2032
xcopy /Y%~dp0\fsharpqa\testenv\src\ILComparer\bin\%1\*%~dp0\fsharpqa\testenv\bin||goto :error
2133

22-
msbuild%~dp0\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj /p:Configuration=%1 /t:Build||goto :error
34+
%_msbuildexe%%~dp0\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj /p:Configuration=%1 /t:Build||goto :error
2335
xcopy /Y%~dp0\fsharpqa\testenv\src\HostedCompilerServer\bin\%1\*%~dp0\fsharpqa\testenv\bin||goto :error
2436

2537
ifexist%~dp0\..\%1\net40\bin (

‎vsintegration/src/Salsa/Salsa.fsproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,4 @@
104104
</ProjectReference>
105105
</ItemGroup>
106106
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
107-
<TargetName="BeforeResolveReferences"Condition="'$(UseNugetPackages)'=='true'">
108-
<CreatePropertyValue="$(ProjectDir)..\..\..\packages\NUnit.2.6.3\lib\;$(ProjectDir)..\..\..\packages\NUnit.Runners.2.6.3\tools\lib\;$(AssemblySearchPaths)">
109-
<OutputTaskParameter="Value"
110-
PropertyName="AssemblySearchPaths" />
111-
</CreateProperty>
112-
</Target>
113107
</Project>

‎vsintegration/src/unittests/Unittests.fsproj‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,8 @@
112112
<ReferenceInclude="Microsoft.VisualStudio.Designer.Interfaces" />
113113
<ReferenceInclude="Microsoft.VisualStudio.CommonIDE" />
114114
<ReferenceInclude="Microsoft.VisualStudio.VSHelp.dll" />
115-
<ReferenceInclude="nunit.framework.dll">
116-
<Private>True</Private>
117-
</Reference>
118-
<ReferenceInclude="nunit.util.dll">
119-
<Private>True</Private>
120-
</Reference>
121-
<ReferenceInclude="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
122-
<SpecificVersion>true</SpecificVersion>
123-
<HintPath>$(FSharpSourcesRoot)\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
124-
</Reference>
115+
<ReferenceInclude="nunit.util.dll"><Private>True</Private></Reference>
116+
<ReferenceInclude="nunit.framework.dll"><Private>True</Private></Reference>
125117
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\Fsc\Fsc.fsproj">
126118
<Project>{ffde9e47-9675-4498-b540-69b2583dd600}</Project>
127119
<Name>Fsc</Name>
@@ -178,11 +170,4 @@
178170
</ProjectReference>
179171
</ItemGroup>
180172
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
181-
<TargetName="BeforeResolveReferences"Condition="'$(UseNugetPackages)'=='true'">
182-
<CreatePropertyValue="$(ProjectDir)..\..\..\packages\NUnit.2.6.3\lib\;$(ProjectDir)..\..\..\packages\NUnit.Runners.2.6.3\tools\lib\;$(AssemblySearchPaths)">
183-
<OutputTaskParameter="Value"
184-
PropertyName="AssemblySearchPaths" />
185-
</CreateProperty>
186-
</Target>
187-
188173
</Project>

‎vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,6 @@
136136
<Win32Resource>$(IntermediateOutputPath)\ProjectResources.rc.res</Win32Resource>
137137
</PropertyGroup>
138138
<TargetName="BeforeBuild">
139-
<ExecCommand="rc.exe /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)" />
139+
<ExecCommand='"$(ProgramFiles)\Windows Kits\8.1\bin\x86\rc.exe" /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)' />
140140
</Target>
141141
</Project>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp