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

Commitfbfbb00

Browse files
authored
Fix master CI (dotnet#5564)
* Binding redirects and update Microsoft.Build.* packages to latest* Update checked in binaries for FSharp.Data
1 parent2553e6c commitfbfbb00

File tree

10 files changed

+27
-8
lines changed

10 files changed

+27
-8
lines changed

‎build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
rem Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
2-
@if"%_echo%"==""echooff
2+
@if"%_echo%"==""echooff
33

44
setlocalenableDelayedExpansion
55

‎build/targets/PackageVersions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<MicrosoftVisualStudioLanguageServicesPackageVersion>$(RoslynPackageVersion)</MicrosoftVisualStudioLanguageServicesPackageVersion>
2121

2222
<!-- Microsoft Build packages-->
23-
<MicrosoftBuildOverallPackagesVersion>15.6.85</MicrosoftBuildOverallPackagesVersion>
23+
<MicrosoftBuildOverallPackagesVersion>15.8.166</MicrosoftBuildOverallPackagesVersion>
2424
<MicrosoftBuildPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildPackageVersion>
2525
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildFrameworkPackageVersion>
2626
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildTasksCorePackageVersion>

‎fcs/FSharp.Compiler.Service.Tests/App.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
<runtime>
44
<legacyUnhandledExceptionPolicyenabled="true" />
55
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1">
6+
<dependentAssembly>
7+
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
8+
<bindingRedirectoldVersion="2.0.0.0-4.5.0.0"newVersion="4.5.0.0"/>
9+
</dependentAssembly>
610
</assemblyBinding>
711
</runtime>
812
<startup>

‎packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
<packageid="Microsoft.Build.Utilities.Core"version="14.3.0" />
2626
<packageid="Microsoft.Build.Tasks.Core"version="14.3.0" />
2727

28-
<packageid="Microsoft.Build"version="15.6.85" />
29-
<packageid="Microsoft.Build.Framework"version="15.6.85" />
30-
<packageid="Microsoft.Build.Utilities.Core"version="15.6.85" />
31-
<packageid="Microsoft.Build.Tasks.Core"version="15.6.85" />
28+
<packageid="Microsoft.Build"version="15.8.166" />
29+
<packageid="Microsoft.Build.Framework"version="15.8.166" />
30+
<packageid="Microsoft.Build.Utilities.Core"version="15.8.166" />
31+
<packageid="Microsoft.Build.Tasks.Core"version="15.8.166" />
3232
<packageid="System.IO.Compression"version="4.3.0" />
3333

3434
<!-- Testing-->
833 KB
Binary file not shown.

‎tests/service/data/FSharp.Data.dll‎

251 KB
Binary file not shown.

‎vsintegration/tests/GetTypesVSUnitTests/GetTypesVSUnitTests.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21+
<PackageReferenceInclude="EnvDTE80"Version="$(EnvDTE80PackageVersion)"PrivateAssets="all"ExcludeAssets="contentFiles;build;analyzers;native" />
2122
<PackageReferenceInclude="NUnit"Version="$(NUnitPackageVersion)" />
23+
<PackageReferenceInclude="VSSDK.VSLangProj.8"Version="$(VSSDKVSLangProj8PackageVersion)"PrivateAssets="all"ExcludeAssets="contentFiles;build;analyzers;native" />
2224
</ItemGroup>
2325

2426
<ItemGroup>

‎vsintegration/tests/UnitTests/App.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,11 @@
3333
<bindingRedirectoldVersion="0.0.0.0-15.1.0.0"newVersion="15.1.0.0" />
3434
</dependentAssembly>
3535
</assemblyBinding>
36+
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1">
37+
<dependentAssembly>
38+
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
39+
<bindingRedirectoldVersion="2.0.0.0-4.5.0.0"newVersion="4.5.0.0"/>
40+
</dependentAssembly>
41+
</assemblyBinding>
3642
</runtime>
3743
</configuration>

‎vsintegration/tests/UnitTests/LegacyProjectSystem/Tests.ProjectSystem.Configs.fs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ open NUnit.Framework
1313
// VS namespaces
1414
openMicrosoft.VisualStudio
1515
openMicrosoft.VisualStudio.Shell.Interop
16+
openMicrosoft.VisualStudio.FSharp
1617
openMicrosoft.VisualStudio.FSharp.ProjectSystem
1718

1819
// Internal unittest namespaces
@@ -22,6 +23,12 @@ open UnitTests.TestLib.Utils.FilesystemHelpers
2223
openUnitTests.TestLib.ProjectSystem
2324

2425

26+
[<SetUpFixture>]
27+
typepublicAssemblyResolverTestFixture()=
28+
29+
[<OneTimeSetUp>]
30+
memberpublic__.Init()= AssemblyResolver.addResolver()
31+
2532
[<TestFixture>][<Category"ProjectSystem">]
2633
typeConfig()=
2734
inherit TheTests()

‎vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
</ItemGroup>
190190

191191
<ItemGroup>
192-
<PackageReferenceInclude="EnvDTE80"Version="$(EnvDTE80PackageVersion)"PrivateAssets="all"ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
192+
<PackageReferenceInclude="EnvDTE80"Version="$(EnvDTE80PackageVersion)"PrivateAssets="all"ExcludeAssets="contentFiles;build;analyzers;native" />
193193
<PackageReferenceInclude="Microsoft.CodeAnalysis.Workspaces.Common"Version="$(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)"PrivateAssets="all"ExcludeAssets="contentFiles;analyzers;native" />
194194
<PackageReferenceInclude="Microsoft.CodeAnalysis.EditorFeatures"Version="$(MicrosoftCodeAnalysisEditorFeaturesPackageVersion)"PrivateAssets="all"ExcludeAssets="contentFiles;analyzers;native" />
195195
<PackageReferenceInclude="Microsoft.CodeAnalysis.EditorFeatures.Text"Version="$(MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion)"PrivateAssets="all"ExcludeAssets="contentFiles;analyzers;native" />
@@ -217,7 +217,7 @@
217217
<PackageReferenceInclude="NUnit"Version="$(NUnitPackageVersion)" />
218218
<PackageReferenceInclude="System.ValueTuple"Version="$(SystemValueTuplePackageVersion)" />
219219
<PackageReferenceInclude="VSSDK.VSHelp"Version="$(VSSDKVSHelpPackageVersion)"PrivateAssets="all"ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
220-
<PackageReferenceInclude="VSSDK.VSLangProj.8"Version="$(VSSDKVSLangProj8PackageVersion)"PrivateAssets="all"ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
220+
<PackageReferenceInclude="VSSDK.VSLangProj.8"Version="$(VSSDKVSLangProj8PackageVersion)"PrivateAssets="all"ExcludeAssets="contentFiles;build;analyzers;native" />
221221
</ItemGroup>
222222

223223
</Project>

0 commit comments

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