Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix master CI #5564

Merged
merged 2 commits into from
Sep 5, 2018
Merged

Fix master CI #5564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
587f443
Binding redirects and update Microsoft.Build.* packages to latest
KevinRansom Aug 29, 2018
578c3cd
Update checked in binaries for FSharp.Data
KevinRansom Sep 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
rem Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
@if "%_echo%"=="" echo off
@if "%_echo%"=="" echo off

setlocal enableDelayedExpansion

Expand Down
2 changes: 1 addition & 1 deletion build/targets/PackageVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<MicrosoftVisualStudioLanguageServicesPackageVersion>$(RoslynPackageVersion)</MicrosoftVisualStudioLanguageServicesPackageVersion>

<!-- Microsoft Build packages -->
<MicrosoftBuildOverallPackagesVersion>15.6.85</MicrosoftBuildOverallPackagesVersion>
<MicrosoftBuildOverallPackagesVersion>15.8.166</MicrosoftBuildOverallPackagesVersion>
<MicrosoftBuildPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildTasksCorePackageVersion>
Expand Down
4 changes: 4 additions & 0 deletions fcs/FSharp.Compiler.Service.Tests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
<runtime>
<legacyUnhandledExceptionPolicy enabled="true" />
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-4.5.0.0" newVersion="4.5.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup>
Expand Down
8 changes: 4 additions & 4 deletions packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<package id="Microsoft.Build.Utilities.Core" version="14.3.0" />
<package id="Microsoft.Build.Tasks.Core" version="14.3.0" />

<package id="Microsoft.Build" version="15.6.85" />
<package id="Microsoft.Build.Framework" version="15.6.85" />
<package id="Microsoft.Build.Utilities.Core" version="15.6.85" />
<package id="Microsoft.Build.Tasks.Core" version="15.6.85" />
<package id="Microsoft.Build" version="15.8.166" />
<package id="Microsoft.Build.Framework" version="15.8.166" />
<package id="Microsoft.Build.Utilities.Core" version="15.8.166" />
<package id="Microsoft.Build.Tasks.Core" version="15.8.166" />
<package id="System.IO.Compression" version="4.3.0" />

<!-- Testing -->
Expand Down
Binary file modified tests/service/data/FSharp.Data.DesignTime.dll
View file
Open in desktop
Binary file not shown.
Binary file modified tests/service/data/FSharp.Data.dll
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions vsintegration/tests/GetTypesVSUnitTests/GetTypesVSUnitTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="EnvDTE80" Version="$(EnvDTE80PackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;build;analyzers;native" />
<PackageReference Include="NUnit" Version="$(NUnitPackageVersion)" />
<PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8PackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;build;analyzers;native" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions vsintegration/tests/UnitTests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,11 @@
<bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-4.5.0.0" newVersion="4.5.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
7 changes: 7 additions & 0 deletions vsintegration/tests/UnitTests/LegacyProjectSystem/Tests.ProjectSystem.Configs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ open NUnit.Framework
// VS namespaces
open Microsoft.VisualStudio
open Microsoft.VisualStudio.Shell.Interop
open Microsoft.VisualStudio.FSharp
open Microsoft.VisualStudio.FSharp.ProjectSystem

// Internal unittest namespaces
Expand All @@ -22,6 +23,12 @@ open UnitTests.TestLib.Utils.FilesystemHelpers
open UnitTests.TestLib.ProjectSystem


[<SetUpFixture>]
type public AssemblyResolverTestFixture () =

[<OneTimeSetUp>]
member public __.Init () = AssemblyResolver.addResolver ()

[<TestFixture>][<Category "ProjectSystem">]
type Config() =
inherit TheTests()
Expand Down
4 changes: 2 additions & 2 deletions vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="EnvDTE80" Version="$(EnvDTE80PackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
<PackageReference Include="EnvDTE80" Version="$(EnvDTE80PackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;build;analyzers;native" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures" Version="$(MicrosoftCodeAnalysisEditorFeaturesPackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
Expand Down Expand Up @@ -217,7 +217,7 @@
<PackageReference Include="NUnit" Version="$(NUnitPackageVersion)" />
<PackageReference Include="System.ValueTuple" Version="$(SystemValueTuplePackageVersion)" />
<PackageReference Include="VSSDK.VSHelp" Version="$(VSSDKVSHelpPackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
<PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8PackageVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
<PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8PackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;build;analyzers;native" />
</ItemGroup>

</Project>