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

Commitedfa6af

Browse files
authored
Build ends up with the wrong version of Microsoft.Build.dlls (dotnet#4903)
1 parentae4e8e2 commitedfa6af

File tree

5 files changed

+4
-13
lines changed

5 files changed

+4
-13
lines changed

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.8.0-beta1-62707-12
1+
2.8.0

‎build/targets/PackageVersions.props‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
<MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioShellInterop100PackageVersion>
3737
<MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61030</MicrosoftVisualStudioShellInterop110PackageVersion>
3838
<MicrosoftVisualStudioShellInterop120PackageVersion>12.0.30110</MicrosoftVisualStudioShellInterop120PackageVersion>
39-
<MicrosoftVisualStudioTextUIPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIPackageVersion>
40-
<MicrosoftVisualStudioTextUIWpfPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIWpfPackageVersion>
4139
<MicrosoftVisualStudioTextManagerInteropPackageVersion>7.10.6070</MicrosoftVisualStudioTextManagerInteropPackageVersion>
4240
<MicrosoftVisualStudioTextManagerInterop80PackageVersion>8.0.50727</MicrosoftVisualStudioTextManagerInterop80PackageVersion>
4341
<MicrosoftVisualStudioTextManagerInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioTextManagerInterop100PackageVersion>
42+
<MicrosoftVisualStudioTextUIPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIPackageVersion>
43+
<MicrosoftVisualStudioTextUIWpfPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIWpfPackageVersion>
4444
<MicrosoftVisualStudioWCFReferenceInteropPackageVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropPackageVersion>
4545
<MicrosoftVSSDKBuildToolsPackageVersion>15.1.192</MicrosoftVSSDKBuildToolsPackageVersion>
4646
<VSSDKDebuggerVisualizersPackageVersion>12.0.4</VSSDKDebuggerVisualizersPackageVersion>
@@ -57,7 +57,6 @@
5757
<NewtonsoftJsonPackageVersion>9.0.1</NewtonsoftJsonPackageVersion>
5858
<NUnitPackageVersion>3.5.0</NUnitPackageVersion>
5959
<XliffTasksPackageVersion>0.2.0-beta-000081</XliffTasksPackageVersion>
60-
6160
</PropertyGroup>
6261

6362
<!-- dependency uptake version overrides-->

‎src/FSharpSource.Settings.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@
117117
<NUnitVersion>3.5.0</NUnitVersion>
118118
<NUnitFullVersion>3.5.0.0</NUnitFullVersion>
119119
<NUnitLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.$(NUnitVersion)\lib\net45</NUnitLibDir>
120-
<NUnitToolsLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.ConsoleRunner\$(NUnitVersion)\tools\</NUnitToolsLibDir>
121120

122121
<MonoPackagingCondition="'$(TargetDotnetProfile)' != 'coreclr' AND '$(OS)' == 'Unix'">true</MonoPackaging>
123122

‎vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
<PackageReferenceInclude="Microsoft.CodeAnalysis.EditorFeatures.Wpf"Version="$(MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion)" />
131131
<PackageReferenceInclude="Microsoft.CodeAnalysis.Workspaces.Common"Version="$(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)" />
132132
<PackageReferenceInclude="Microsoft.Composition"Version="$(MicrosoftCompositionPackageVersion)" />
133+
<PackageReferenceInclude="Microsoft.VisualFSharp.Msbuild.15.0"Version="$(MicrosoftVisualFSharpMSBuild150PackageVersion)" />
133134
<PackageReferenceInclude="Microsoft.VisualStudio.ComponentModelHost"Version="$(MicrosoftVisualStudioComponentModelHostPackageVersion)" />
134135
<PackageReferenceInclude="Microsoft.VisualStudio.Editor"Version="$(MicrosoftVisualStudioEditorPackageVersion)" />
135136
<PackageReferenceInclude="Microsoft.VisualStudio.Language"Version="$(MicrosoftVisualStudioLanguagePackageVersion)" />

‎vsintegration/tests/UnitTests/VisualFSharp.UnitTests.dll.config‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818
<assemblyIdentityname="Microsoft.VisualStudio.Shell.10.0"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
1919
<bindingRedirectoldVersion="2.0.0.0-10.0.0.0"newVersion="11.0.0.0" />
2020
</dependentAssembly>
21-
<dependentAssembly>
22-
<assemblyIdentityname="Microsoft.Build.Framework"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
23-
<bindingRedirectoldVersion="2.0.0.0-15.6.0.0"newVersion="15.6.0.0" />
24-
</dependentAssembly>
25-
<dependentAssembly>
26-
<assemblyIdentityname="Microsoft.Build.Utilities"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
27-
<bindingRedirectoldVersion="2.0.0.0-15.6.0.0"newVersion="15.6.0.0" />
28-
</dependentAssembly>
2921
<dependentAssembly>
3022
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
3123
<bindingRedirectoldVersion="2.0.0.0-4.4.3.0"newVersion="4.4.3.0" />

0 commit comments

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