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

Commitae51ca7

Browse files
committed
Update VS tooling code to F# 4.0
1 parent98090d3 commitae51ca7

File tree

41 files changed

+107
-89
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+107
-89
lines changed

‎vsintegration/src/Salsa/VsMocks.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,7 @@ module internal VsActual =
16351635
openMicrosoft.VisualStudio.Text
16361636

16371637
letvsInstallDir=
1638-
letkey=@"SOFTWARE\Microsoft\VisualStudio\12.0"
1638+
letkey=@"SOFTWARE\Microsoft\VisualStudio\14.0"
16391639
lethklm= Microsoft.Win32.RegistryKey.OpenBaseKey(Microsoft.Win32.RegistryHive.LocalMachine, Microsoft.Win32.RegistryView.Registry32)
16401640
letrkey= hklm.OpenSubKey(key)
16411641
rkey.GetValue("InstallDir"):?> string
@@ -1682,4 +1682,4 @@ module internal VsActual =
16821682

16831683
letexportProvider=new CompositionContainer(new AggregateCatalog(CreateEditorCatalog()),true,null)
16841684
letiTextBufferFactoryService= exportProvider.GetExportedValue<ITextBufferFactoryService>()
1685-
letcreateTextBuffer(text:string)= iTextBufferFactoryService .CreateTextBuffer(text, iTextBufferFactoryService .TextContentType)
1685+
letcreateTextBuffer(text:string)= iTextBufferFactoryService .CreateTextBuffer(text, iTextBufferFactoryService .TextContentType)

‎vsintegration/src/Templates/ConsoleProjectTemplates/ProjectTemplates/ConsoleApplication/ConsoleApplication.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
@@ -12,7 +12,7 @@
1212
<TargetFrameworkVersion>v$targetframeworkversion$</TargetFrameworkVersion>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
$if$ ($targetframeworkversion$ >= 4.0)
15-
<TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
15+
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
1616
$else$
1717
<TargetFSharpCoreVersion>2.3.0.0</TargetFSharpCoreVersion>
1818
$endif$

‎vsintegration/src/Templates/LibraryProjectTemplates/ProjectTemplates/Library/Library.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
@@ -11,7 +11,7 @@
1111
<AssemblyName>$safeprojectname$</AssemblyName>
1212
<TargetFrameworkVersion>v$targetframeworkversion$</TargetFrameworkVersion>
1313
$if$ ($targetframeworkversion$ >= 4.0)
14-
<TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
14+
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
1515
$else$
1616
<TargetFSharpCoreVersion>2.3.0.0</TargetFSharpCoreVersion>
1717
$endif$

‎vsintegration/src/Templates/NetCore259ProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
@@ -12,7 +12,7 @@
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
1414
<TargetProfile>netcore</TargetProfile>
15-
<TargetFSharpCoreVersion>3.259.3.1</TargetFSharpCoreVersion>
15+
<TargetFSharpCoreVersion>3.259.4.0</TargetFSharpCoreVersion>
1616
</PropertyGroup>
1717
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
1818
<DebugSymbols>true</DebugSymbols>

‎vsintegration/src/Templates/NetCore78ProjectTemplates/ProjectTemplates/NetCorePortableLibrary/PortableLibrary.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
@@ -12,7 +12,7 @@
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
1414
<TargetProfile>netcore</TargetProfile>
15-
<TargetFSharpCoreVersion>3.78.3.1</TargetFSharpCoreVersion>
15+
<TargetFSharpCoreVersion>3.78.4.0</TargetFSharpCoreVersion>
1616
</PropertyGroup>
1717
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
1818
<DebugSymbols>true</DebugSymbols>

‎vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
@@ -12,7 +12,7 @@
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
1414
<TargetProfile>netcore</TargetProfile>
15-
<TargetFSharpCoreVersion>3.3.1.0</TargetFSharpCoreVersion>
15+
<TargetFSharpCoreVersion>3.7.4.0</TargetFSharpCoreVersion>
1616
</PropertyGroup>
1717
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
1818
<DebugSymbols>true</DebugSymbols>

‎vsintegration/src/Templates/PortableLibraryProjectTemplates/ProjectTemplates/PortableLibrary/PortableLibrary.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
@@ -11,7 +11,7 @@
1111
<AssemblyName>$safeprojectname$</AssemblyName>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<TargetFrameworkProfile>Profile47</TargetFrameworkProfile>
14-
<TargetFSharpCoreVersion>2.3.5.1</TargetFSharpCoreVersion>
14+
<TargetFSharpCoreVersion>3.47.4.0</TargetFSharpCoreVersion>
1515
</PropertyGroup>
1616
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
1717
<DebugSymbols>true</DebugSymbols>

‎vsintegration/src/Templates/SilverlightProjectTemplates/ProjectTemplates/SilverlightLibrary/SilverlightLibrary.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
@@ -18,7 +18,7 @@
1818
<SilverlightApplication>false</SilverlightApplication>
1919
<ValidateXaml>true</ValidateXaml>
2020
<ThrowErrorsInValidation>false</ThrowErrorsInValidation>
21-
<TargetFSharpCoreVersion>2.3.5.1</TargetFSharpCoreVersion>
21+
<TargetFSharpCoreVersion>3.47.4.0</TargetFSharpCoreVersion>
2222
</PropertyGroup>
2323
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
2424
<DebugSymbols>true</DebugSymbols>

‎vsintegration/src/Templates/TutorialProjectTemplates/ProjectTemplates/Tutorial/Tutorial.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ProjectToolsVersion="14.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
@@ -12,7 +12,7 @@
1212
<TargetFrameworkVersion>v$targetframeworkversion$</TargetFrameworkVersion>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
$if$ ($targetframeworkversion$ >= 4.0)
15-
<TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
15+
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
1616
$else$
1717
<TargetFSharpCoreVersion>2.3.0.0</TargetFSharpCoreVersion>
1818
$endif$

‎vsintegration/src/deployment/EnableOpenSource/EnableOpenSource.pkgdef‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,86 +3,86 @@
33
"name"="FSharp.Compiler"
44
"publicKeyToken"="b03f5f7f11d50a3a"
55
"culture"="neutral"
6-
"oldVersion"="4.3.0.0-4.3.1.0"
7-
"newVersion"="4.3.1.9055"
6+
"oldVersion"="4.3.0.0-4.4.0.0"
7+
"newVersion"="4.4.0.9055"
88
"codeBase"="$PackageFolder$\FSharp.Compiler.dll"
99

1010
[$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{091CE614-9F5C-46F6-82ED-2BCEC3740C54}]
1111
"name"="FSharp.Compiler.Server.Shared"
1212
"publicKeyToken"="b03f5f7f11d50a3a"
1313
"culture"="neutral"
14-
"oldVersion"="4.3.0.0-4.3.1.0"
15-
"newVersion"="4.3.1.9055"
14+
"oldVersion"="4.3.0.0-4.4.0.0"
15+
"newVersion"="4.4.0.9055"
1616
"codeBase"="$PackageFolder$\FSharp.Compiler.Server.Shared.dll"
1717

1818
[$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{4D79C9FC-8AB8-476D-8526-E55B2AF6C6B7}]
1919
"name"="FSharp.Core"
2020
"publicKeyToken"="b03f5f7f11d50a3a"
2121
"culture"="neutral"
22-
"oldVersion"="2.3.5.1-4.3.1.9055"
23-
"newVersion"="4.3.1.9055"
22+
"oldVersion"="2.3.0.0-4.4.0.0"
23+
"newVersion"="4.4.0.9055"
2424
"codeBase"="$PackageFolder$\FSharp.Core.dll"
2525

2626
[$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{2DB67780-3B09-41E5-A8DC-92AF2E1665BD}}]
2727
"name"="FSharp.Editor"
2828
"publicKeyToken"="b03f5f7f11d50a3a"
2929
"culture"="neutral"
30-
"oldVersion"="12.0.0.0"
31-
"newVersion"="12.0.0.9055"
30+
"oldVersion"="12.0.0.0-14.0.0.0"
31+
"newVersion"="14.0.0.9055"
3232
"codeBase"="$PackageFolder$\FSharp.Editor.dll"
3333

3434
[$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{EBAA5FAC-BE56-4693-82AB-0FD093861AAE}]
3535
"name"="FSharp.LanguageService"
3636
"publicKeyToken"="b03f5f7f11d50a3a"
3737
"culture"="neutral"
38-
"oldVersion"="12.0.0.0"
39-
"newVersion"="12.0.0.9055"
38+
"oldVersion"="12.0.0.0-14.0.0.0"
39+
"newVersion"="14.0.0.9055"
4040
"codeBase"="$PackageFolder$\FSharp.LanguageService.dll"
4141

4242
[$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{B1E0C67D-87CD-4EA5-A9BC-0D8210A876E7}]
4343
"name"="FSharp.LanguageService.Base"
4444
"publicKeyToken"="b03f5f7f11d50a3a"
4545
"culture"="neutral"
46-
"oldVersion"="12.0.0.0"
47-
"newVersion"="12.0.0.9055"
46+
"oldVersion"="12.0.0.0-14.0.0.0"
47+
"newVersion"="14.0.0.9055"
4848
"codeBase"="$PackageFolder$\FSharp.LanguageService.Base.dll"
4949

5050
[$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{C9555D76-CA9E-484F-9C53-ED10598E2A48}]
5151
"name"="FSharp.LanguageService.Compiler"
5252
"publicKeyToken"="b03f5f7f11d50a3a"
5353
"culture"="neutral"
54-
"oldVersion"="12.0.0.0"
55-
"newVersion"="12.0.0.9055"
54+
"oldVersion"="12.0.0.0-14.0.0.0"
55+
"newVersion"="14.0.0.9055"
5656
"codeBase"="$PackageFolder$\FSharp.LanguageService.Compiler.dll"
5757

5858
[$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{892D5910-A99B-4591-9A90-6FBA6E7EFB83}]
5959
"name"="FSharp.VS.FSI"
6060
"publicKeyToken"="b03f5f7f11d50a3a"
6161
"culture"="neutral"
62-
"oldVersion"="12.0.0.0"
63-
"newVersion"="12.0.0.9055"
62+
"oldVersion"="12.0.0.0-14.0.0.0"
63+
"newVersion"="14.0.0.9055"
6464
"codeBase"="$PackageFolder$\FSharp.VS.FSI.dll"
6565

6666
[$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{01E671A2-D375-4F61-AAB1-FC4A360B7566}]
6767
"name"="FSharp.ProjectSystem.FSharp"
6868
"publicKeyToken"="b03f5f7f11d50a3a"
6969
"culture"="neutral"
70-
"oldVersion"="12.0.0.0"
71-
"newVersion"="12.0.0.9055"
70+
"oldVersion"="12.0.0.0-14.0.0.0"
71+
"newVersion"="14.0.0.9055"
7272
"codeBase"="$PackageFolder$\FSharp.ProjectSystem.FSharp.dll"
7373

7474
[$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{1FD3D46E-E558-4000-AB74-60745B18F991}]
7575
"name"="FSharp.ProjectSystem.Base"
7676
"publicKeyToken"="b03f5f7f11d50a3a"
7777
"culture"="neutral"
78-
"oldVersion"="12.0.0.0"
79-
"newVersion"="12.0.0.9055"
78+
"oldVersion"="12.0.0.0-14.0.0.0"
79+
"newVersion"="14.0.0.9055"
8080
"codeBase"="$PackageFolder$\FSharp.ProjectSystem.Base.dll"
8181

8282
[$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{666BAAE7-BC0E-4B74-8048-09567E0862E6}]
8383
"name"="FSharp.ProjectSystem.PropertyPages"
8484
"publicKeyToken"="b03f5f7f11d50a3a"
8585
"culture"="neutral"
86-
"oldVersion"="12.0.0.0"
87-
"newVersion"="12.0.0.9055"
86+
"oldVersion"="12.0.0.0-14.0.0.0"
87+
"newVersion"="14.0.0.9055"
8888
"codeBase"="$PackageFolder$\FSharp.ProjectSystem.PropertyPages.dll"

0 commit comments

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