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

Commit8a53c85

Browse files
committed
only pull references from NuGet packages, never from the GAC
1 parent6368914 commit8a53c85

File tree

24 files changed

+93
-100
lines changed

24 files changed

+93
-100
lines changed

‎build-everything.proj‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,28 +84,32 @@
8484
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-unittests-build.proj"/>
8585
</ItemGroup>
8686

87+
<PropertyGroup>
88+
<CustomProps>AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</CustomProps>
89+
</PropertyGroup>
90+
8791
<!-- +++++++++++++++++++++++ Targets +++++++++++++++++++++++++++++++-->
8892

8993
<TargetName="Build">
90-
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
91-
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
92-
<MSBuildProjects="@(NugetProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);" />
93-
<MSBuildProjects="@(SetupProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
94+
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
95+
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
96+
<MSBuildProjects="@(NugetProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);$(CustomProps)" />
97+
<MSBuildProjects="@(SetupProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
9498
</Target>
9599

96100
<TargetName="Rebuild">
97-
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
98-
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
99-
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
100-
<MSBuildProjects="@(NugetProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);" />
101-
<MSBuildProjects="@(SetupProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
101+
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
102+
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true;$(CustomProps)" />
103+
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
104+
<MSBuildProjects="@(NugetProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);$(CustomProps)" />
105+
<MSBuildProjects="@(SetupProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
102106
</Target>
103107

104108
<TargetName="Clean">
105-
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
106-
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
107-
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
108-
<MSBuildProjects="@(NugetProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);" />
109-
<MSBuildProjects="@(SetupProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
109+
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
110+
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true;$(CustomProps)" />
111+
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
112+
<MSBuildProjects="@(NugetProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);$(CustomProps)" />
113+
<MSBuildProjects="@(SetupProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
110114
</Target>
111115
</Project>

‎build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ echo.
473473

474474
echo ---------------- Done with arguments, starting preparation -----------------
475475

476-
setBuildToolsPackage=Microsoft.VSSDK.BuildTools.15.0.26201
476+
setBuildToolsPackage=Microsoft.VSSDK.BuildTools.15.1.192
477477
if"%VSSDKInstall%"=="" (
478478
setVSSDKInstall=%~dp0packages\%BuildToolsPackage%\tools\vssdk
479479
)

‎fcs/fcs.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@
99
<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</FsiToolPath>
1010
<FsiToolExe>fsi.exe</FsiToolExe>
1111

12+
<SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
13+
<AssemblySearchPaths>{HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</AssemblySearchPaths>
14+
1215
</PropertyGroup>
1316
</Project>

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<packageid="BenchmarkDotNet.Diagnostics.Windows"version="0.9.8"/>
3333
<packageid="Newtonsoft.Json"version="8.0.1"/>
3434
<packageid="Microsoft.FSharp.TupleSample"version="1.0.0-alpha-161121"/>
35-
<packageid="Microsoft.VSSDK.BuildTools"version="15.5.72" />
35+
<packageid="Microsoft.VSSDK.BuildTools"version="15.1.192" />
3636

3737
<!-- Annoyingly the build of FSharp.Compiler.Server.Shared references a Visual Studio-specific attribute-->
3838
<!-- That DLL is logically part of the F# Compiler and F# Interactive but is shipped as part of the Visual F# IDE Tools-->

‎setup/fsharp-setup-build.proj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,26 @@
5757
</Target>
5858

5959
<TargetName="Build"DependsOnTargets="CollectSetupProjects">
60+
<PropertyGroup>
61+
<CustomProps>AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</CustomProps>
62+
</PropertyGroup>
6063
<!-- Wix targets files doesn't handle localization parameters correctly. Cleaning before building files accross languages-->
6164
<MSBuildProjects="%(WixSetupProjects.ProjectPath)"
6265
Targets="Clean;Build"
63-
Properties="LocaleCode=%(WixSetupProjects.LocaleCode);LocaleId=%(WixSetupProjects.LocaleId);LocaleParentCulture=%(WixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(WixSetupProjects.LocaleSpecificCulture);IsLangPack=%(WixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion)"/>
66+
Properties="LocaleCode=%(WixSetupProjects.LocaleCode);LocaleId=%(WixSetupProjects.LocaleId);LocaleParentCulture=%(WixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(WixSetupProjects.LocaleSpecificCulture);IsLangPack=%(WixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);$(CustomProps)"/>
6467
<MSBuildProjects="%(VsixProjects.ProjectPath)"
6568
Targets="Build"
66-
Properties="IsLangPack=%(VsixProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);OutputPath=$(InsertionDir)"/>
69+
Properties="IsLangPack=%(VsixProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);OutputPath=$(InsertionDir);$(CustomProps)"/>
6770
<MSBuildProjects="%(SwixSetupProjects.ProjectPath)"
6871
Targets="Build"
69-
Properties="LocaleCode=%(SwixSetupProjects.LocaleCode);LocaleId=%(SwixSetupProjects.LocaleId);LocaleParentCulture=%(SwixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SwixSetupProjects.LocaleSpecificCulture);IsLangPack=%(SwixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion)"/>
72+
Properties="LocaleCode=%(SwixSetupProjects.LocaleCode);LocaleId=%(SwixSetupProjects.LocaleId);LocaleParentCulture=%(SwixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SwixSetupProjects.LocaleSpecificCulture);IsLangPack=%(SwixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);$(CustomProps)"/>
7073

7174
<!-- copy json stuff-->
7275
<CopySourceFiles="@(InsertionItems)"DestinationFolder="$(InsertionDir)" />
7376

7477
<MSBuildProjects="Swix\Microsoft.FSharp.vsmanproj"
75-
Targets="Build" />
78+
Targets="Build"
79+
Properties="$(CustomProps)" />
7680
</Target>
7781

7882
<TargetName="CopyLocalizationResources"BeforeTargets="Build">

‎src/FSharpSource.Settings.targets‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<RoslynVSBinariesVersion>15.0</RoslynVSBinariesVersion>
3737
<RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>
3838
<SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
39-
<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26201</VSSDK_BUILDTOOLS_VERSION>
39+
<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.1.192</VSSDK_BUILDTOOLS_VERSION>
4040

4141
<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>
4242
<MicrosoftVisualStudioValidationVersion>15.3.15</MicrosoftVisualStudioValidationVersion>
@@ -49,6 +49,11 @@
4949
<FSharpCore41FrozenPortableVersion>4.1.20</FSharpCore41FrozenPortableVersion>
5050
<FSharpCore41FrozenPortableTargetVersion>4.1.21</FSharpCore41FrozenPortableTargetVersion>
5151
<FSharpCore42TargetVersion>4.2.4</FSharpCore42TargetVersion>
52+
53+
<NUnitVersion>3.5.0</NUnitVersion>
54+
<NUnitFullVersion>3.5.0.0</NUnitFullVersion>
55+
<NUnitLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.$(NUnitVersion)\lib\net45</NUnitLibDir>
56+
<NUnitToolsLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.ConsoleRunner\$(NUnitVersion)\tools\</NUnitToolsLibDir>
5257
</PropertyGroup>
5358

5459
<PropertyGroupCondition="'$(MonoPackaging)' != 'true' AND '$(OS)' != 'Unix'">

‎src/FSharpSource.targets‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@
9999

100100
<PropertyGroup>
101101
<NugetLocalPackagesDir>$(FSharpSourcesRoot)\..\packages</NugetLocalPackagesDir>
102-
<NUnitVersion>3.5.0</NUnitVersion>
103-
<NUnitFullVersion>3.5.0.0</NUnitFullVersion>
104-
<NUnitLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.$(NUnitVersion)\lib\net45</NUnitLibDir>
105-
<NUnitToolsLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.ConsoleRunner\$(NUnitVersion)\tools\</NUnitToolsLibDir>
106102
<FsCheckVersion>2.6.2</FsCheckVersion>
107103
<FsCheckFullVersion>2.6.2.0</FsCheckFullVersion>
108104
<FsCheckLibDir>$(FSharpSourcesRoot)\..\packages\FsCheck.$(FsCheckVersion)\lib\</FsCheckLibDir>

‎src/root.traversal.targets‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
22
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003"ToolsVersion="4.0">
3+
4+
<PropertyGroup>
5+
<CustomProps>AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</CustomProps>
6+
</PropertyGroup>
7+
38
<TargetName="Build">
4-
<MSBuildProjects="@(ProjectFiles)"BuildInParallel="true"Targets="Build"Condition="'$(TargetPlatform)' == 'coreclr'" />
5-
<MSBuildProjects="@(ProjectFiles)"BuildInParallel="false"Targets="Build"Condition="'$(TargetPlatform)' != 'coreclr'" />
9+
<MSBuildProjects="@(ProjectFiles)"BuildInParallel="true"Targets="Build"Condition="'$(TargetPlatform)' == 'coreclr'"Properties="$(CustomProps)"/>
10+
<MSBuildProjects="@(ProjectFiles)"BuildInParallel="false"Targets="Build"Condition="'$(TargetPlatform)' != 'coreclr'"Properties="$(CustomProps)"/>
611
</Target>
712

813
<TargetName="Rebuild">
9-
<MSBuildProjects="@(ProjectFiles)"BuildInParallel="true"Targets="Rebuild"Condition="'$(TargetPlatform)' == 'coreclr'" />
10-
<MSBuildProjects="@(ProjectFiles)"BuildInParallel="false"Targets="Rebuild"Condition="'$(TargetPlatform)' != 'coreclr'" />
14+
<MSBuildProjects="@(ProjectFiles)"BuildInParallel="true"Targets="Rebuild"Condition="'$(TargetPlatform)' == 'coreclr'"Properties="$(CustomProps)"/>
15+
<MSBuildProjects="@(ProjectFiles)"BuildInParallel="false"Targets="Rebuild"Condition="'$(TargetPlatform)' != 'coreclr'"Properties="$(CustomProps)"/>
1116
</Target>
1217

1318
<TargetName="Clean">
14-
<MSBuildProjects="@(ProjectFiles)"BuildInParallel="false"Targets="Clean" />
19+
<MSBuildProjects="@(ProjectFiles)"BuildInParallel="false"Targets="Clean"Properties="$(CustomProps)"/>
1520
</Target>
1621
</Project>

‎tests/service/data/CSharp_Analysis/CSharp_Analysis.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<WhenCondition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.6') Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5')">
4949
<ItemGroup>
5050
<ReferenceInclude="nunit.framework">
51-
<HintPath>..\..\..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
51+
<HintPath>..\..\..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
5252
<Private>True</Private>
5353
<Paket>True</Paket>
5454
</Reference>

‎vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@
5757
<MicroBuildAssemblyFileLanguage>cs</MicroBuildAssemblyFileLanguage>
5858
<DeployExtension>false</DeployExtension>
5959
</PropertyGroup>
60+
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
61+
<ImportProject="$(FSharpSourcesRoot)\..\packages\$(VSSDK_BUILDTOOLS_VERSION)\build\Microsoft.VsSDK.BuildTools.props" />
6062
<PropertyGroupCondition=" '$(Configuration)' == 'Debug'">
6163
<StartAction>Program</StartAction>
6264
<StartProgram>$(DevEnvDir)devenv.exe</StartProgram>

0 commit comments

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