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

Commitfb54266

Browse files
committed
convert FSharp.PropertyPages to use PackageReference
1 parent1605352 commitfb54266

File tree

8 files changed

+30
-164
lines changed

8 files changed

+30
-164
lines changed

‎build/targets/PackageVersions.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<MicrosoftVisualStudioEditorPackageVersion>15.0.26201</MicrosoftVisualStudioEditorPackageVersion>
2020
<MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>15.0.26201</MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>
2121
<MicrosoftVisualStudioLanguageIntellisensePackageVersion>15.0.26201</MicrosoftVisualStudioLanguageIntellisensePackageVersion>
22+
<MicrosoftVisualStudioManagedInterfacesPackageVersion>8.0.50727</MicrosoftVisualStudioManagedInterfacesPackageVersion>
2223
<MicrosoftVisualStudioPackageLanguageService150PackageVersion>15.0.26201</MicrosoftVisualStudioPackageLanguageService150PackageVersion>
2324
<MicrosoftVisualStudioProjectAggregatorPackageVersion>8.0.50727</MicrosoftVisualStudioProjectAggregatorPackageVersion>
2425
<MicrosoftVisualStudioShell140PackageVersion>14.3.25407</MicrosoftVisualStudioShell140PackageVersion>
@@ -33,10 +34,12 @@
3334
<MicrosoftVisualStudioTextManagerInteropPackageVersion>7.10.6070</MicrosoftVisualStudioTextManagerInteropPackageVersion>
3435
<MicrosoftVisualStudioTextManagerInterop80PackageVersion>8.0.50727</MicrosoftVisualStudioTextManagerInterop80PackageVersion>
3536
<MicrosoftVisualStudioTextManagerInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioTextManagerInterop100PackageVersion>
37+
<MicrosoftVisualStudioWCFReferenceInteropPackageVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropPackageVersion>
3638
<MicrosoftVSSDKBuildToolsPackageVersion>15.1.192</MicrosoftVSSDKBuildToolsPackageVersion>
3739
<VSSDKDebuggerVisualizersPackageVersion>12.0.4</VSSDKDebuggerVisualizersPackageVersion>
3840
<VSSDKVSLangProjPackageVersion>7.0.4</VSSDKVSLangProjPackageVersion>
3941
<VSSDKVSLangProj8PackageVersion>8.0.4</VSSDKVSLangProj8PackageVersion>
42+
<VSSDKVSLangProj11PackageVersion>11.0.4</VSSDKVSLangProj11PackageVersion>
4043
<VSSDKVSHelpPackageVersion>7.0.4</VSSDKVSHelpPackageVersion>
4144

4245
<!-- other packages-->

‎vsintegration/fsharp-vsintegration-src-build.proj‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,10 @@
1616
<ProjectFilesInclude="src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj" />
1717
</ItemGroup>
1818

19-
<ItemGroup>
20-
<SdkProjectsInclude="src\FSharp.Editor\FSharp.Editor.fsproj" />
21-
<SdkProjectsInclude="src\FSharp.LanguageService\FSharp.LanguageService.fsproj" />
22-
<SdkProjectsInclude="src\FSharp.UIResources\FSharp.UIResources.csproj" />
23-
<SdkProjectsInclude="src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj" />
24-
<SdkProjectsInclude="src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj" />
25-
<SdkProjectsInclude="src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj" />
26-
<SdkProjectsInclude="src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj" />
27-
</ItemGroup>
28-
2919
<ImportProject="..\src\root.traversal.targets"/>
3020

3121
<TargetName="Restore">
32-
<MSBuildProjects="@(SdkProjects)"Targets="Restore" />
22+
<MSBuildProjects="@(ProjectFiles)"Targets="Restore" />
3323
</Target>
3424

3525
</Project>

‎vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<PackageReferenceInclude="Microsoft.VisualStudio.ProjectAggregator"Version="$(MicrosoftVisualStudioProjectAggregatorPackageVersion)" />
6666
<PackageReferenceInclude="Microsoft.VisualStudio.Designer.Interfaces"Version="$(MicrosoftVisualStudioDesignerInterfacesPackageVersion)" />
6767
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Design"Version="$(MicrosoftVisualStudioShellDesignPackageVersion)" />
68-
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.14.0"Version="$(MicrosoftVisualStudioShell140PackageVersion)" />
68+
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.14.0"Version="$(MicrosoftVisualStudioShell140PackageVersion)"PrivateAssets="all"/>
6969
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.15.0"Version="$(MicrosoftVisualStudioShell150PackageVersion)" />
7070
<PackageReferenceInclude="Microsoft.VisualFSharp.Microsoft.VisualStudio.Shell.UI.Internal"Version="$(MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalPackageVersion)" />
7171
<PackageReferenceInclude="VSSDK.VSHelp"Version="$(VSSDKVSHelpPackageVersion)" />
Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
' Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
22

3-
ImportsSystem
4-
ImportsSystem.Reflection
5-
ImportsSystem.Runtime.CompilerServices
63
ImportsMicrosoft.VisualStudio.Shell
74

8-
'/* F# additions: begin. */
9-
<Assembly:AssemblyDescription("FSharp.ProjectSystem.Base.dll")>
10-
<Assembly:AssemblyCompany("Microsoft Corporation")>
11-
<Assembly:AssemblyTitle("FSharp.ProjectSystem.Base.dll")>
12-
<Assembly:AssemblyCopyright("\x00a9 Microsoft Corporation. All rights reserved.")>
13-
<Assembly:AssemblyProduct("Microsoft\x00ae F#")>
14-
<Assembly:AssemblyConfiguration("")>
15-
<Assembly:AssemblyCulture("")>
16-
175
<Assembly:ProvideCodeBase(CodeBase:="$PackageFolder$\\FSharp.ProjectSystem.PropertyPages.dll")>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<ImportProject="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
3+
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<ImportProject="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
3+
</Project>

‎vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj‎

Lines changed: 19 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
33
<ProjectToolsVersion="15.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4-
<PropertyGroup>
5-
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
6-
<ProjectLanguage>VisualBasic</ProjectLanguage>
7-
<MicroBuildAssemblyVersion>15.4.1.0</MicroBuildAssemblyVersion>
8-
<MicroBuildAssemblyFileLanguage>vb</MicroBuildAssemblyFileLanguage>
9-
</PropertyGroup>
4+
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
105
<PropertyGroup>
116
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
127
<TargetDotnetProfileCondition=" '$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
@@ -29,35 +24,17 @@
2924
<RegisterForComInterop>false</RegisterForComInterop>
3025
<WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
3126
<NoWarn>40026;42105;42107;42353</NoWarn>
32-
<!-- Copy everything to SuiteBin so that it can be unittested-->
33-
<CopyToSuiteBin>true</CopyToSuiteBin>
3427
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
3528
<TargetFrameworkProfile>
3629
</TargetFrameworkProfile>
37-
<ImportVSSDKTargets>true</ImportVSSDKTargets>
30+
<ImportVsSDK>true</ImportVsSDK>
3831
<CreateVsixContainer>false</CreateVsixContainer>
3932
<DeployExtension>false</DeployExtension>
4033
<UseCodebase>true</UseCodebase>
4134
<GeneratePkgDefFile>true</GeneratePkgDefFile>
4235
<IncludePkgdefInVSIXContainer>true</IncludePkgdefInVSIXContainer>
4336
</PropertyGroup>
44-
<PropertyGroup>
45-
<SignAssembly>true</SignAssembly>
46-
<AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
47-
<DefineConstants>STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY=True,$(DefineConstants)</DefineConstants>
48-
<StrongNames>true</StrongNames>
49-
<DelaySign>true</DelaySign>
50-
</PropertyGroup>
51-
<ItemGroup>
52-
<FilesToLocalizeInclude="$(OutDir)$(AssemblyName).dll">
53-
<TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl</TranslationFile>
54-
<LciCommentFile>$(FSharpSourcesRoot)\..\loc\lci\$(AssemblyName).dll.lci</LciCommentFile>
55-
<HasLceComments>false</HasLceComments>
56-
<InProject>false</InProject>
57-
</FilesToLocalize>
58-
</ItemGroup>
59-
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
60-
37+
6138
<ItemGroup>
6239
<ImportInclude="Microsoft.VisualBasic" />
6340
<ImportInclude="System" />
@@ -78,106 +55,19 @@
7855
</ItemGroup>
7956

8057
<ItemGroup>
81-
<ReferenceInclude="Microsoft.VisualStudio.WCFReference.Interop">
82-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.WCFReference.Interop.9.0.30729\lib\Microsoft.VisualStudio.WCFReference.Interop.dll</HintPath>
83-
<Private>True</Private>
84-
</Reference>
85-
<ReferenceInclude="Microsoft.VisualStudio.ManagedInterfaces">
86-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.ManagedInterfaces.8.0.50727\lib\Microsoft.VisualStudio.ManagedInterfaces.dll</HintPath>
87-
<Private>True</Private>
88-
</Reference>
89-
<ReferenceInclude="VSLangProj">
90-
<HintPath>$(FSharpSourcesRoot)\..\packages\VSSDK.VSLangProj.7.0.4\lib\net20\VSLangProj.dll</HintPath>
91-
<Private>True</Private>
92-
</Reference>
93-
<ReferenceInclude="VSLangProj80">
94-
<HintPath>$(FSharpSourcesRoot)\..\packages\VSSDK.VSLangProj.8.8.0.4\lib\net20\VSLangProj80.dll</HintPath>
95-
<Private>True</Private>
96-
</Reference>
97-
<ReferenceInclude="VSLangProj90">
98-
<HintPath>$(FSharpSourcesRoot)\..\packages\VSSDK.VSLangProj.9.9.0.4\lib\net20\VSLangProj90.dll</HintPath>
99-
<Private>True</Private>
100-
</Reference>
101-
<ReferenceInclude="VSLangProj100">
102-
<HintPath>$(FSharpSourcesRoot)\..\packages\VSSDK.VSLangProj.10.10.0.4\lib\net20\VSLangProj100.dll</HintPath>
103-
<Private>True</Private>
104-
</Reference>
105-
<ReferenceInclude="VSLangProj110">
106-
<HintPath>$(FSharpSourcesRoot)\..\packages\VSSDK.VSLangProj.11.11.0.4\lib\net20\VSLangProj110.dll</HintPath>
107-
<Private>True</Private>
108-
</Reference>
109-
<ReferenceInclude="EnvDTE.dll">
110-
<HintPath>$(FSharpSourcesRoot)\..\packages\EnvDTE.8.0.1\lib\net10\EnvDTE.dll</HintPath>
111-
<Private>True</Private>
112-
</Reference>
113-
<ReferenceInclude="EnvDTE80.dll">
114-
<HintPath>$(FSharpSourcesRoot)\..\packages\EnvDTE80.8.0.1\lib\net10\EnvDTE80.dll</HintPath>
115-
<Private>True</Private>
116-
</Reference>
117-
<ReferenceInclude="Microsoft.VisualStudio.OLE.Interop">
118-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
119-
<Private>True</Private>
120-
</Reference>
121-
<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.10.0">
122-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
123-
</Reference>
124-
<ReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.11.0">
125-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
126-
<Private>True</Private>
127-
</Reference>
128-
<ReferenceInclude="Microsoft.VisualStudio.ProjectAggregator">
129-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.ProjectAggregator.8.0.50727\lib\net45\Microsoft.VisualStudio.ProjectAggregator.dll</HintPath>
130-
<Private>True</Private>
131-
</Reference>
132-
<ReferenceInclude="Microsoft.VisualStudio.Shell.Design, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
133-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Design.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Design.dll</HintPath>
134-
</Reference>
135-
<ReferenceInclude="Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion), Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
136-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).$(RoslynVSPackagesVersion)\lib\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).dll</HintPath>
137-
</Reference>
138-
<ReferenceInclude="Microsoft.VisualStudio.Shell.Framework, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
139-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Framework.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
140-
<Private>True</Private>
141-
</Reference>
142-
<ReferenceInclude="Microsoft.VisualStudio.Threading">
143-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.$(MicrosoftVisualStudioThreadingVersion)\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
144-
</Reference>
145-
<ReferenceInclude="Microsoft.VisualStudio.Utilities, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
146-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Utilities.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
147-
</Reference>
148-
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop">
149-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
150-
<Private>True</Private>
151-
</Reference>
152-
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.8.0">
153-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
154-
<Private>True</Private>
155-
</Reference>
156-
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.9.0">
157-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
158-
<Private>True</Private>
159-
</Reference>
160-
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0">
161-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
162-
<Private>True</Private>
163-
</Reference>
164-
<ReferenceInclude="Microsoft.VisualStudio.Shell.Interop.11.0">
165-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
166-
<Private>True</Private>
167-
</Reference>
168-
<ReferenceInclude="Microsoft.VisualStudio.TextManager.Interop">
169-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
170-
<Private>True</Private>
171-
</Reference>
172-
<ReferenceInclude="Microsoft.VisualStudio.VSHelp">
173-
<HintPath>$(FSharpSourcesRoot)\..\packages\VSSDK.VSHelp.7.0.4\lib\net20\Microsoft.VisualStudio.VSHelp.dll</HintPath>
174-
<Private>True</Private>
175-
</Reference>
176-
<ProjectReferenceInclude="..\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj">
177-
<Name>ProjectSystem.Base</Name>
178-
<Project>{b700e38b-f8c0-4e49-b5ec-db7b7ac0c4e7}</Project>
179-
<Private>True</Private>
180-
</ProjectReference>
58+
<PackageReferenceInclude="EnvDTE80"Version="$(EnvDTE80PackageVersion)" />
59+
<PackageReferenceInclude="Microsoft.VisualStudio.ManagedInterfaces"Version="$(MicrosoftVisualStudioManagedInterfacesPackageVersion)" />
60+
<PackageReferenceInclude="Microsoft.VisualStudio.ProjectAggregator"Version="$(MicrosoftVisualStudioProjectAggregatorPackageVersion)" />
61+
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Design"Version="$(MicrosoftVisualStudioShellDesignPackageVersion)" />
62+
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.10.0"Version="$(MicrosoftVisualStudioShellImmutable100PackageVersion)" />
63+
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.11.0"Version="$(MicrosoftVisualStudioShellImmutable110PackageVersion)" />
64+
<PackageReferenceInclude="Microsoft.VisualStudio.WCFReference.Interop"Version="$(MicrosoftVisualStudioWCFReferenceInteropPackageVersion)" />
65+
<PackageReferenceInclude="VSSDK.VSHelp"Version="$(VSSDKVSHelpPackageVersion)" />
66+
<PackageReferenceInclude="VSSDK.VSLangProj.11"Version="$(VSSDKVSLangProj11PackageVersion)" />
67+
</ItemGroup>
68+
69+
<ItemGroup>
70+
<ProjectReferenceInclude="..\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj" />
18171
</ItemGroup>
18272

18373
<ItemGroup>
@@ -374,12 +264,7 @@
374264
<ItemGroup>
375265
<ServiceInclude="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
376266
</ItemGroup>
377-
<ItemGroup />
267+
378268
<ImportProject="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
379-
<PropertyGroup>
380-
<SuiteBinPath>$(SuiteBinPath)\FSharp</SuiteBinPath>
381-
</PropertyGroup>
382-
383-
<ImportProject="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
384-
<ImportProject="$(VsSDKInstall)\Microsoft.VsSDK.targets" />
385-
</Project>
269+
270+
</Project>

‎vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.vb‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,8 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages
7575
m_OutputTypeStringKeys(INDEX_COMMANDLINEAPP)=SR.GetString(SR.PPG_CommandLineApp)
7676
m_OutputTypeStringKeys(INDEX_WINDOWSCLASSLIB)=SR.GetString(SR.PPG_WindowsClassLib)
7777

78-
#IfVS_VERSION_DEV14Then
79-
Dimv20FSharpRedistKeyAsString="HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\4.0\Runtime\v2.0"
80-
Dimv40FSharpRedistKeyAsString="HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\4.0\Runtime\v4.0"
81-
#EndIf
82-
#IfVS_VERSION_DEV15Then
8378
Dimv20FSharpRedistKeyAsString="HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\4.1\Runtime\v2.0"
8479
Dimv40FSharpRedistKeyAsString="HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\4.1\Runtime\v4.0"
85-
#EndIf
8680

8781
m_v20FSharpRedistInstalled=Not(IsNothing(Microsoft.Win32.Registry.GetValue(v20FSharpRedistKey,Nothing,Nothing)))
8882
m_v40FSharpRedistInstalled=Not(IsNothing(Microsoft.Win32.Registry.GetValue(v40FSharpRedistKey,Nothing,Nothing)))

0 commit comments

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