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

Commit325fc42

Browse files
committed
update appveyor support
1 parentb8ffef2 commit325fc42

File tree

8 files changed

+204
-25
lines changed

8 files changed

+204
-25
lines changed

‎.nuget/NuGet.Config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<addkey="disableSourceControlIntegration"value="true" />
5+
</solution>
6+
</configuration>

‎.nuget/NuGet.exe‎

1.59 MB
Binary file not shown.

‎.nuget/NuGet.targets‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ProjectToolsVersion="4.0"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDirCondition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
5+
6+
<!-- Enable the restore command to run before builds-->
7+
<RestorePackagesCondition=" '$(RestorePackages)' == ''">false</RestorePackages>
8+
9+
<!-- Property that enables building a package from a project-->
10+
<BuildPackageCondition=" '$(BuildPackage)' == ''">false</BuildPackage>
11+
12+
<!-- Determines if package restore consent is required to restore packages-->
13+
<RequireRestoreConsentCondition=" '$(RequireRestoreConsent)' != 'false'">true</RequireRestoreConsent>
14+
15+
<!-- Download NuGet.exe if it does not already exist-->
16+
<DownloadNuGetExeCondition=" '$(DownloadNuGetExe)' == ''">false</DownloadNuGetExe>
17+
</PropertyGroup>
18+
19+
<ItemGroupCondition=" '$(PackageSources)' == ''">
20+
<!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used-->
21+
<!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list-->
22+
<!--
23+
<PackageSource Include="https://www.nuget.org/api/v2/" />
24+
<PackageSource Include="https://my-nuget-source/nuget/" />
25+
-->
26+
</ItemGroup>
27+
28+
<PropertyGroupCondition=" '$(OS)' == 'Windows_NT'">
29+
<!-- Windows specific commands-->
30+
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
31+
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
32+
</PropertyGroup>
33+
34+
<PropertyGroupCondition=" '$(OS)' != 'Windows_NT'">
35+
<!-- We need to launch nuget.exe with the mono command if we're not on windows-->
36+
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
37+
<PackagesConfig>packages.config</PackagesConfig>
38+
</PropertyGroup>
39+
40+
<PropertyGroup>
41+
<!-- NuGet command-->
42+
<NuGetExePathCondition=" '$(NuGetExePath)' == ''">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
43+
<PackageSourcesCondition=" $(PackageSources) == ''">@(PackageSource)</PackageSources>
44+
45+
<NuGetCommandCondition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
46+
<NuGetCommandCondition=" '$(OS)' != 'Windows_NT'">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
47+
48+
<PackageOutputDirCondition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
49+
50+
<RequireConsentSwitchCondition=" $(RequireRestoreConsent) == 'true'">-RequireConsent</RequireConsentSwitch>
51+
<NonInteractiveSwitchCondition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT'">-NonInteractive</NonInteractiveSwitch>
52+
53+
<PaddedSolutionDirCondition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
54+
<PaddedSolutionDirCondition=" '$(OS)' != 'Windows_NT'">"$(SolutionDir)"</PaddedSolutionDir>
55+
56+
<!-- Commands-->
57+
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
58+
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
59+
60+
<!-- We need to ensure packages are restored prior to assembly resolve-->
61+
<BuildDependsOnCondition="$(RestorePackages) == 'true'">
62+
RestorePackages;
63+
$(BuildDependsOn);
64+
</BuildDependsOn>
65+
66+
<!-- Make the build depend on restore packages-->
67+
<BuildDependsOnCondition="$(BuildPackage) == 'true'">
68+
$(BuildDependsOn);
69+
BuildPackage;
70+
</BuildDependsOn>
71+
</PropertyGroup>
72+
73+
<TargetName="CheckPrerequisites">
74+
<!-- Raise an error if we're unable to locate nuget.exe-->
75+
<ErrorCondition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')"Text="Unable to locate '$(NuGetExePath)'" />
76+
<!--
77+
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
78+
This effectively acts as a lock that makes sure that the download operation will only happen once and all
79+
parallel builds will have to wait for it to complete.
80+
-->
81+
<MsBuildTargets="_DownloadNuGet"Projects="$(MSBuildThisFileFullPath)"Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
82+
</Target>
83+
84+
<TargetName="_DownloadNuGet">
85+
<DownloadNuGetOutputFilename="$(NuGetExePath)"Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
86+
</Target>
87+
88+
<TargetName="RestorePackages"DependsOnTargets="CheckPrerequisites">
89+
<ExecCommand="$(RestoreCommand)"
90+
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
91+
92+
<ExecCommand="$(RestoreCommand)"
93+
LogStandardErrorAsError="true"
94+
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
95+
</Target>
96+
97+
<TargetName="BuildPackage"DependsOnTargets="CheckPrerequisites">
98+
<ExecCommand="$(BuildCommand)"
99+
Condition=" '$(OS)' != 'Windows_NT'" />
100+
101+
<ExecCommand="$(BuildCommand)"
102+
LogStandardErrorAsError="true"
103+
Condition=" '$(OS)' == 'Windows_NT'" />
104+
</Target>
105+
106+
<UsingTaskTaskName="DownloadNuGet"TaskFactory="CodeTaskFactory"AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
107+
<ParameterGroup>
108+
<OutputFilenameParameterType="System.String"Required="true" />
109+
</ParameterGroup>
110+
<Task>
111+
<ReferenceInclude="System.Core" />
112+
<UsingNamespace="System" />
113+
<UsingNamespace="System.IO" />
114+
<UsingNamespace="System.Net" />
115+
<UsingNamespace="Microsoft.Build.Framework" />
116+
<UsingNamespace="Microsoft.Build.Utilities" />
117+
<CodeType="Fragment"Language="cs">
118+
<![CDATA[
119+
try {
120+
OutputFilename = Path.GetFullPath(OutputFilename);
121+
122+
Log.LogMessage("Downloading latest version of NuGet.exe...");
123+
WebClient webClient = new WebClient();
124+
webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
125+
126+
return true;
127+
}
128+
catch (Exception ex) {
129+
Log.LogErrorFromException(ex);
130+
return false;
131+
}
132+
]]>
133+
</Code>
134+
</Task>
135+
</UsingTask>
136+
</Project>

‎build.cmd‎

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@echooff
1+
@echoon
22

33
:: Check prerequisites
44
set_msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
@@ -10,19 +10,46 @@ if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe. Please see h
1010
set_gacutilexe="%ProgramFiles(x86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\gacutil.exe"
1111
ifnotexist%_gacutilexe%echo Error: Could not find gacutil.exe.&&goto :eof
1212

13+
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages
14+
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :eof
15+
1316
::Build
1417
%_gacutilexe% /i lkg\FSharp-2.0.50726.900\bin\FSharp.Core.dll
18+
@if ERRORLEVEL1echo Error: gacutil failed&&goto :eof
19+
1520
%_msbuildexe% src\fsharp-proto-build.proj
21+
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :eof
1622
ngen install lib\proto\fsc-proto.exe
17-
%_msbuildexe% src/fsharp-library-build.proj
18-
%_msbuildexe% src/fsharp-compiler-build.proj
19-
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=net20
20-
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable47
21-
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable7
22-
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable78
23-
%_msbuildexe% src/fsharp-library-unittests-build.proj
24-
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47
25-
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7
26-
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78
27-
src\update.cmd debug -ngen
28-
tests\BuildTestTools.cmd debug
23+
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true
24+
@if ERRORLEVEL1echo Error: library debug build failed&&goto :eof
25+
%_msbuildexe% src/fsharp-compiler-build.proj /p:UseNugetPackages=true
26+
@if ERRORLEVEL1echo Error: compile debug build failed&&goto :eof
27+
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=net20
28+
@if ERRORLEVEL1echo Error: library net20 debug build failed&&goto :eof
29+
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable47
30+
@if ERRORLEVEL1echo Error: library portable47 debug build failed&&goto :eof
31+
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
32+
@if ERRORLEVEL1echo Error: library portable7 debug build failed&&goto :eof
33+
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable78
34+
@if ERRORLEVEL1echo Error: library portable78 debug build failed&&goto :eof
35+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true
36+
@if ERRORLEVEL1echo Error: library unittests debug build failed&&goto :eof
37+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable47
38+
@if ERRORLEVEL1echo Error: library unittests debug build failed portable47&&goto :eof
39+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
40+
@if ERRORLEVEL1echo Error: library unittests debug build failed portable7&&goto :eof
41+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable78
42+
@if ERRORLEVEL1echo Error: library unittests debug build failed portable78&&goto :eof
43+
@echoon
44+
call src\update.cmd debug -ngen
45+
@echoon
46+
call tests\BuildTestTools.cmd debug
47+
REM @if ERRORLEVEL 1 echo Error: 'tests\BuildTestTools.cmd debug' failed && goto :eof
48+
@echoon
49+
setPATH=%PATH%;%~dp0%packages\NUnit.Runners.2.6.3\tools\
50+
tests\RunTests.cmd debug fsharpqa CodeGen01
51+
@if ERRORLEVEL1echo Error: 'RunTests.cmd debug fsharpqa CodeGen01' failed&&goto :eof
52+
tests\RunTests.cmd debug coreunit
53+
@if ERRORLEVEL1echo Error: 'RunTests.cmd debug coreunit' failed&&goto :eof
54+
tests\RunTests.cmd debug fsharp Core01
55+
@if ERRORLEVEL1echo Error: 'RunTests.cmd debug fsharpqa CodeGen01' failed&&goto :eof

‎packages.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<packageid="NUnit"version="2.6.3"targetFramework="net40" />
4+
<packageid="NUnit.Runners"version="2.6.3" />
5+
</packages>

‎src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@
2626
{TargetFrameworkDirectory};
2727
{Registry:Software\Microsoft\.NETFramework,v4.5,AssemblyFoldersEx};
2828
</AssemblySearchPaths>
29-
</PropertyGroup>
29+
</PropertyGroup>
30+
<TargetName="BeforeResolveReferences"Condition="'$(UseNugetPackages)'=='true'">
31+
<CreatePropertyValue="..\..\..\packages\NUnit.2.6.3\lib;$(AssemblySearchPaths)">
32+
<OutputTaskParameter="Value"PropertyName="AssemblySearchPaths" />
33+
</CreateProperty>
34+
</Target>
3035
<PropertyGroup>
3136
<DefineConstantsCondition=" '$(TargetFramework)' == 'sl5'">$(DefineConstants);SILVERLIGHT</DefineConstants>
3237
<DefineConstants>$(DefineConstants);EXTENSIONTYPING</DefineConstants>

‎tests/fsharpqa/Source/test.lst‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CodeGen01,NoMTCodeGen\EmittedIL\AsyncExpressionStepping
1010
CodeGen01,NoMTCodeGen\EmittedIL\AttributeTargets
1111
CodeGen01,NoMTCodeGen\EmittedIL\CCtorDUWithMember
1212
CodeGen01,NoMTCodeGen\EmittedIL\CompiledNameAttribute
13-
CodeGen01,NoMTCodeGen\EmittedIL\ComputationExpressions
13+
CodeGen01,NoMT,SmokeCodeGen\EmittedIL\ComputationExpressions
1414
CodeGen01,NoMTCodeGen\EmittedIL\DoNotBoxStruct
1515
CodeGen01,NoMTCodeGen\EmittedIL\GeneratedIterators
1616
CodeGen01,NoMTCodeGen\EmittedIL\InequalityComparison
@@ -125,14 +125,14 @@ Conformance03Conformance\Expressions\ControlFlowExpressions\TryCatch
125125
Conformance03Conformance\Expressions\ControlFlowExpressions\TryFinally
126126
Conformance03Conformance\Expressions\ControlFlowExpressions\While
127127
Conformance03Conformance\Expressions\DataExpressions\AddressOf
128-
Conformance03Conformance\Expressions\DataExpressions\ComputationExpressions
128+
Conformance03,SmokeConformance\Expressions\DataExpressions\ComputationExpressions
129129
Conformance03Conformance\Expressions\DataExpressions\ObjectExpressions
130130
Conformance03Conformance\Expressions\DataExpressions\QueryExpressions
131131
Conformance03Conformance\Expressions\DataExpressions\RangeExpressions
132132

133133
Conformance04Conformance\Expressions\DataExpressions\SequenceExpressions
134134
Conformance04Conformance\Expressions\DataExpressions\Simple
135-
Conformance04Conformance\Expressions\DataExpressions\TupleExpressions
135+
Conformance04,SmokeConformance\Expressions\DataExpressions\TupleExpressions
136136
Conformance04Conformance\Expressions\ElaborationAndElaboratedExpressions
137137
Conformance04Conformance\Expressions\EvaluationAndValues
138138
Conformance04Conformance\Expressions\EvaluationOfElaboratedForms
@@ -187,7 +187,7 @@ Conformance06Conformance\ObjectOrientedTypeDefinitions\ClassTypes\AutoPropert
187187
Conformance06Conformance\ObjectOrientedTypeDefinitions\ClassTypes\ExplicitFields
188188
Conformance06Conformance\ObjectOrientedTypeDefinitions\ClassTypes\ExplicitObjectConstructors
189189
Conformance06Conformance\ObjectOrientedTypeDefinitions\ClassTypes\ImplicitObjectConstructors
190-
Conformance06Conformance\ObjectOrientedTypeDefinitions\ClassTypes\InheritsDeclarations
190+
Conformance06,SmokeConformance\ObjectOrientedTypeDefinitions\ClassTypes\InheritsDeclarations
191191
Conformance06Conformance\ObjectOrientedTypeDefinitions\ClassTypes\LetDoDeclarations
192192
Conformance06Conformance\ObjectOrientedTypeDefinitions\ClassTypes\MemberDeclarations
193193
Conformance06Conformance\ObjectOrientedTypeDefinitions\ClassTypes\Misc
@@ -210,7 +210,7 @@ Conformance07Conformance\PatternMatching\DynamicTypeTest
210210
Conformance07Conformance\PatternMatching\Expression
211211
Conformance07Conformance\PatternMatching\Named
212212
Conformance07Conformance\PatternMatching\Null
213-
Conformance07Conformance\PatternMatching\Record
213+
Conformance07,SmokeConformance\PatternMatching\Record
214214
Conformance07Conformance\PatternMatching\Simple
215215
Conformance07Conformance\PatternMatching\SimpleConstant
216216

@@ -226,7 +226,7 @@ Conformance08Conformance\TypesAndTypeConstraints\CheckingSyntacticTypes
226226
Conformance08Conformance\TypesAndTypeConstraints\LogicalPropertiesOfTypes
227227
Conformance08Conformance\TypesAndTypeConstraints\TypeConstraints
228228
Conformance08Conformance\TypesAndTypeConstraints\TypeParameterDefinitions
229-
Conformance08Conformance\UnitsOfMeasure\Basic
229+
Conformance08,SmokeConformance\UnitsOfMeasure\Basic
230230
Conformance08Conformance\UnitsOfMeasure\Bounds
231231
Conformance08Conformance\UnitsOfMeasure\Constants
232232
Conformance08Conformance\UnitsOfMeasure\Diagnostics
@@ -312,6 +312,6 @@ Misc02..\..\..\testsprivate\fsharpqa\Source\RealWorld\UnitsOfMeasure
312312
Misc02..\..\..\testsprivate\fsharpqa\Source\RealWorld\Agents
313313
Misc02,NoMT..\..\..\testsprivate\fsharpqa\Source\Setup
314314
Misc02Stress
315-
Misc02XmlDoc\Basic
315+
Misc02,SmokeXmlDoc\Basic
316316
Misc02XmlDoc\OCamlDoc
317317
Misc02XmlDoc\UnitOfMeasure

‎tests/test.lst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Remember to use **TABS** not spaces.
99
# I don't know who you are. I don't know what you want. But if you hose daily automation by forgetting tabs, I will look for you, I will find you, and I will revert your checkin.
1010

11-
Core01fsharp\core\access
11+
Core01,Smokefsharp\core\access
1212
Core01fsharp\core\apporder
1313
Core01fsharp\core\array
1414
Core01fsharp\core\attributes
@@ -36,7 +36,7 @@ Core03fsharp\core\internalsvisible
3636
Core03fsharp\core\interop
3737
Core03fsharp\core\lazy
3838
Core03fsharp\core\letrec
39-
Core03fsharp\core\libtest
39+
Core03,Smokefsharp\core\libtest
4040
Core03fsharp\core\lift
4141
Core03fsharp\core\load-script
4242
Core03fsharp\core\longnames
@@ -66,7 +66,7 @@ Core06fsharp\core\queriesOverIQueryable
6666
Core06..\testsprivate\fsharp\core\queriesOverIQueryableLinqToEntities
6767
Core06..\testsprivate\fsharp\core\queriesOverIQueryableLinqToSql
6868
Core06fsharp\core\queriesOverOData
69-
Core06,CoreQuotesfsharp\core\quotes
69+
Core06,CoreQuotes,Smokefsharp\core\quotes
7070
Core06fsharp\core\quotesDebugInfo
7171
Core06fsharp\core\quotesInMultipleModules
7272
Core07fsharp\core\reflect
@@ -144,7 +144,7 @@ Samples07..\testsprivate\fsharp\samples\XBoxLiveLogViewer
144144
Samples07..\testsprivate\fsharp\samples\XNA\WindowsXNAGame
145145
Samples07..\testsprivate\fsharp\samples\XNA\XBox360Game
146146

147-
TypeProviders01fsharp\typeProviders\helloWorld
147+
TypeProviders01,Smokefsharp\typeProviders\helloWorld
148148
TypeProviders01..\testsprivate\fsharp\typeProviders\builtin\DbmlFile
149149
TypeProviders01fsharp\typeProviders\builtin\EdmxFile
150150
TypeProviders01fsharp\typeProviders\builtin\ODataService

0 commit comments

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