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

Commit4ea60fb

Browse files
committed
Fix them to use nunit from nuget.
1 parentc2708eb commit4ea60fb

File tree

3 files changed

+24
-5
lines changed

3 files changed

+24
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@
111111
</ItemGroup>
112112
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
113113
<TargetName="BeforeResolveReferences"Condition="'$(UseNugetPackages)'=='true'">
114-
<CreatePropertyValue="$(ProjectDir)..\..\..\packages\NUnit.2.6.3\lib\;$(AssemblySearchPaths)">
114+
<CreatePropertyValue="$(ProjectDir)..\..\..\packages\NUnit.2.6.3\lib\;$(ProjectDir)..\..\..\packages\NUnit.Runners.2.6.3\tools\lib\;$(AssemblySearchPaths)">
115115
<OutputTaskParameter="Value"
116-
PropertyName="AssemblySearchPaths" />
116+
PropertyName="AssemblySearchPath" />
117117
</CreateProperty>
118118
</Target>
119119
</Project>

‎vsintegration/src/Salsa/Salsa.fsproj‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@
6262
<ReferenceInclude="Microsoft.VisualStudio.VSHelp.dll" />
6363
<ReferenceInclude="Microsoft.VisualStudio.Text.Data" />
6464
<ReferenceInclude="Microsoft.VisualStudio.CoreUtility" />
65-
<ReferenceInclude="nunit.framework" />
65+
<ReferenceInclude="nunit.framework"><Private>True</Private></Reference>
66+
<ReferenceInclude="nunit.util"><Private>True</Private></Reference>
6667
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
6768
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
6869
<Name>FSharp.Core</Name>
@@ -99,4 +100,10 @@
99100
</ProjectReference>
100101
</ItemGroup>
101102
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
103+
<TargetName="BeforeResolveReferences"Condition="'$(UseNugetPackages)'=='true'">
104+
<CreatePropertyValue="$(ProjectDir)..\..\..\packages\NUnit.2.6.3\lib\;$(ProjectDir)..\..\..\packages\NUnit.Runners.2.6.3\tools\lib\;$(AssemblySearchPaths)">
105+
<OutputTaskParameter="Value"
106+
PropertyName="AssemblySearchPaths" />
107+
</CreateProperty>
108+
</Target>
102109
</Project>

‎vsintegration/src/unittests/Unittests.fsproj‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
<ReferenceInclude="$(MsBuild_EngineReference)" />
8686
<ReferenceInclude="$(MsBuild_Reference)" />
8787
<ReferenceInclude="$(MsBuild_UtilitiesReference)" />
88-
<ReferenceInclude="Microsoft.Build.Utilities.v3.5.dll" />
8988
<ReferenceInclude="EnvDTE.dll" />
9089
<ReferenceInclude="EnvDTE80.dll" />
9190
<ReferenceInclude="VSLangProj" />
@@ -106,10 +105,16 @@
106105
<ReferenceInclude="Microsoft.VisualStudio.Designer.Interfaces" />
107106
<ReferenceInclude="Microsoft.VisualStudio.CommonIDE" />
108107
<ReferenceInclude="Microsoft.VisualStudio.VSHelp.dll" />
109-
<ReferenceInclude="nunit.framework.dll" />
108+
<ReferenceInclude="nunit.framework.dll">
109+
<Private>True</Private>
110+
</Reference>
111+
<ReferenceInclude="nunit.util.dll">
112+
<Private>True</Private>
113+
</Reference>
110114
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\Fsc\Fsc.fsproj">
111115
<Project>{ffde9e47-9675-4498-b540-69b2583dd600}</Project>
112116
<Name>Fsc</Name>
117+
<Private>True</Private>
113118
</ProjectReference>
114119
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
115120
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
@@ -162,4 +167,11 @@
162167
</ProjectReference>
163168
</ItemGroup>
164169
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
170+
<TargetName="BeforeResolveReferences"Condition="'$(UseNugetPackages)'=='true'">
171+
<CreatePropertyValue="$(ProjectDir)..\..\..\packages\NUnit.2.6.3\lib\;$(ProjectDir)..\..\..\packages\NUnit.Runners.2.6.3\tools\lib\;$(AssemblySearchPaths)">
172+
<OutputTaskParameter="Value"
173+
PropertyName="AssemblySearchPaths" />
174+
</CreateProperty>
175+
</Target>
176+
165177
</Project>

0 commit comments

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