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

Commitf886e7a

Browse files
authored
Merge pull request #3162 from brettfo/update-vs-references
update necessary VS references to 15.3
2 parents195ae7d +ff65987 commitf886e7a

File tree

6 files changed

+16
-9
lines changed

6 files changed

+16
-9
lines changed

‎src/FSharpSource.Settings.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<!--<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.$(RoslynVSPackagesVersion)</VSSDK_BUILDTOOLS_VERSION>-->
4040
<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26201</VSSDK_BUILDTOOLS_VERSION>
4141

42-
<MicrosoftVisualStudioThreadingVersion>15.0.240</MicrosoftVisualStudioThreadingVersion>
43-
<MicrosoftVisualStudioValidationVersion>15.0.82</MicrosoftVisualStudioValidationVersion>
42+
<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>
43+
<MicrosoftVisualStudioValidationVersion>15.3.15</MicrosoftVisualStudioValidationVersion>
4444

4545
<!-- Always qualify the IntermediateOutputPath by the TargetFramework if any exists-->
4646
<IntermediateOutputPath>obj\$(Configuration)\$(TargetFramework)\</IntermediateOutputPath>

‎vsintegration/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<packageid="Microsoft.VisualFSharp.Microsoft.VisualStudio.Shell.UI.Internal"version="14.0.25420"targetFramework="net46" />
4545

4646
<packageid="Microsoft.VisualStudio.Shell.Immutable.15.0"version="15.0.25123-Dev15Preview"targetFramework="net46" />
47-
<packageid="Microsoft.VisualStudio.Threading"version="15.0.240"targetFramework="net46" />
48-
<packageid="Microsoft.VisualStudio.Validation"version="15.0.82"targetFramework="net46" />
47+
<packageid="Microsoft.VisualStudio.Threading"version="15.3.23"targetFramework="net46" />
48+
<packageid="Microsoft.VisualStudio.Validation"version="15.3.15"targetFramework="net46" />
4949
<packageid="Microsoft.VisualStudio.Shell.Design"version="15.0.26201"targetFramework="net46" />
5050
<packageid="Microsoft.VisualStudio.Package.LanguageService.15.0"version="15.0.26201"targetFramework="net46" />
5151
<packageid="Microsoft.VisualStudio.Editor"version="15.0.26201"targetFramework="net46" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
<Private>True</Private>
145145
</Reference>
146146
<ReferenceInclude="EnvDTE80">
147-
<HintPath>$(FSharpSourcesRoot)\..\packages\EnvDTE80.8.0.1\lib\net10\EnvDTE.dll</HintPath>
147+
<HintPath>$(FSharpSourcesRoot)\..\packages\EnvDTE80.8.0.1\lib\net10\EnvDTE80.dll</HintPath>
148148
<Private>True</Private>
149149
</Reference>
150150
<ReferenceInclude="Microsoft.VisualStudio.Threading">

‎vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<Private>True</Private>
7171
</Reference>
7272
<ReferenceInclude="EnvDTE80.dll">
73-
<HintPath>$(FSharpSourcesRoot)\..\packages\EnvDTE80.8.0.1\lib\net10\EnvDTE.dll</HintPath>
73+
<HintPath>$(FSharpSourcesRoot)\..\packages\EnvDTE80.8.0.1\lib\net10\EnvDTE80.dll</HintPath>
7474
<Private>True</Private>
7575
</Reference>
7676
<ReferenceInclude="VSLangProj">
@@ -135,6 +135,9 @@
135135
<ReferenceInclude="Microsoft.VisualStudio.Threading">
136136
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.$(MicrosoftVisualStudioThreadingVersion)\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
137137
</Reference>
138+
<ReferenceInclude="Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion), Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
139+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).$(RoslynVSPackagesVersion)\lib\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).dll</HintPath>
140+
</Reference>
138141
<ReferenceInclude="Microsoft.VisualStudio.Shell.Framework, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
139142
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Framework.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
140143
</Reference>
@@ -163,7 +166,7 @@
163166
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Design.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Design.dll</HintPath>
164167
</Reference>
165168
<ReferenceInclude="Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion), Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
166-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).dll</HintPath>
169+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).$(RoslynVSPackagesVersion)\lib\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).dll</HintPath>
167170
</Reference>
168171
<ReferenceInclude="Microsoft.VisualStudio.Package.LanguageService.$(RoslynVSBinariesVersion), Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
169172
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Package.LanguageService.$(RoslynVSBinariesVersion).$(RoslynVSPackagesVersion)\lib\Microsoft.VisualStudio.Package.LanguageService.$(RoslynVSBinariesVersion).dll</HintPath>

‎vsintegration/tests/unittests/VisualFSharp.Unittests.dll.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
<assemblyIdentityname="Microsoft.VisualStudio.Platform.VSEditor"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
4040
<bindingRedirectoldVersion="14.0.0.0-15.0.0.0"newVersion="15.0.0.0" />
4141
</dependentAssembly>
42+
<dependentAssembly>
43+
<assemblyIdentityname="Microsoft.VisualStudio.Threading"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
44+
<bindingRedirectoldVersion="14.0.0.0-15.3.0.0"newVersion="15.3.0.0" />
45+
</dependentAssembly>
4246
<dependentAssembly>
4347
<assemblyIdentityname="Microsoft.VisualStudio.Platform.VSEditor.Interop"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
4448
<bindingRedirectoldVersion="14.0.0.0-15.0.0.0"newVersion="15.0.0.0" />

‎vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,11 @@
216216
<ReferenceInclude="Microsoft.VisualStudio.Text.Logic, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
217217
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Logic.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.Logic.dll</HintPath>
218218
</Reference>
219-
<ReferenceInclude="Microsoft.VisualStudio.Threading, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
219+
<ReferenceInclude="Microsoft.VisualStudio.Threading">
220220
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.$(MicrosoftVisualStudioThreadingVersion)\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
221221
<Private>True</Private>
222222
</Reference>
223-
<ReferenceInclude="Microsoft.VisualStudio.Validation, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
223+
<ReferenceInclude="Microsoft.VisualStudio.Validation">
224224
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Validation.$(MicrosoftVisualStudioValidationVersion)\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
225225
<Private>True</Private>
226226
</Reference>

0 commit comments

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