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

Commit9586ecd

Browse files
committed
convert FSharp.UIResources to the dotnet SDK
1 parentdaacde6 commit9586ecd

File tree

7 files changed

+53
-129
lines changed

7 files changed

+53
-129
lines changed

‎VisualFSharp.sln‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion =15.0.27116.0
4+
VisualStudioVersion =15.0.27130.2024
55
MinimumVisualStudioVersion =10.0.40219.1
66
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Private","src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
@@ -20,7 +20,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FSharp.LanguageService.Base
2020
EndProject
2121
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="FSharp.Editor","vsintegration\src\FSharp.Editor\FSharp.Editor.fsproj","{65E0E82A-EACE-4787-8994-888674C2FE87}"
2222
EndProject
23-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="ProjectSystem.Base","vsintegration\src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj","{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}"
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="ProjectSystem.Base","vsintegration\src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj","{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}"
2424
EndProject
2525
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") ="FSharp.PropertiesPages","vsintegration\src\FSharp.ProjectSystem.PropertyPages\FSharp.PropertiesPages.vbproj","{FCFB214C-462E-42B3-91CA-FC557EFEE74F}"
2626
EndProject
@@ -126,7 +126,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{D086C8C6
126126
EndProject
127127
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="LanguageServiceProfiling","vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj","{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}"
128128
EndProject
129-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="FSharp.UIResources","vsintegration\src\FSharp.UIResources\FSharp.UIResources.csproj","{C4586A06-1402-48BC-8E35-A1B8642F895B}"
129+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="FSharp.UIResources","vsintegration\src\FSharp.UIResources\FSharp.UIResources.csproj","{C4586A06-1402-48BC-8E35-A1B8642F895B}"
130130
EndProject
131131
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="CSharp_Analysis","tests\service\data\CSharp_Analysis\CSharp_Analysis.csproj","{887630A3-4B1D-40EA-B8B3-2D842E9C40DB}"
132132
EndProject
@@ -238,10 +238,10 @@ Global
238238
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Debug|Any CPU.Build.0=Debug|Any CPU
239239
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Debug|x86.ActiveCfg=Debug|Any CPU
240240
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Debug|x86.Build.0=Debug|Any CPU
241-
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
242-
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|Any CPU.Build.0=Proto|Any CPU
243-
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|x86.ActiveCfg=Proto|Any CPU
244-
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|x86.Build.0=Proto|Any CPU
241+
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|Any CPU.ActiveCfg=Release|Any CPU
242+
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|Any CPU.Build.0=Release|Any CPU
243+
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|x86.ActiveCfg=Release|Any CPU
244+
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Proto|x86.Build.0=Release|Any CPU
245245
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|Any CPU.ActiveCfg=Release|Any CPU
246246
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|Any CPU.Build.0=Release|Any CPU
247247
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|x86.ActiveCfg=Release|Any CPU
@@ -706,10 +706,10 @@ Global
706706
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Debug|Any CPU.Build.0=Debug|Any CPU
707707
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Debug|x86.ActiveCfg=Debug|Any CPU
708708
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Debug|x86.Build.0=Debug|Any CPU
709-
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
710-
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|Any CPU.Build.0=Proto|Any CPU
711-
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|x86.ActiveCfg=Proto|Any CPU
712-
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|x86.Build.0=Proto|Any CPU
709+
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|Any CPU.ActiveCfg=Release|Any CPU
710+
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|Any CPU.Build.0=Release|Any CPU
711+
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|x86.ActiveCfg=Release|Any CPU
712+
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Proto|x86.Build.0=Release|Any CPU
713713
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Release|Any CPU.ActiveCfg=Release|Any CPU
714714
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Release|Any CPU.Build.0=Release|Any CPU
715715
{C4586A06-1402-48BC-8E35-A1B8642F895B}.Release|x86.ActiveCfg=Release|Any CPU

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<ItemGroup>
2020
<SdkProjectsInclude="src\FSharp.Editor\FSharp.Editor.fsproj" />
2121
<SdkProjectsInclude="src\FSharp.LanguageService\FSharp.LanguageService.fsproj" />
22+
<SdkProjectsInclude="src\FSharp.UIResources\FSharp.UIResources.csproj" />
2223
<SdkProjectsInclude="src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj" />
2324
<SdkProjectsInclude="src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj" />
2425
<SdkProjectsInclude="src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj" />
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>
Lines changed: 35 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,56 @@
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.-->
3-
<ProjectToolsVersion="15.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ProjectSdk="Microsoft.NET.Sdk">
4+
45
<PropertyGroup>
5-
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
6-
<ProjectLanguage>CSharp</ProjectLanguage>
7-
<MicroBuildAssemblyVersion>15.4.1.0</MicroBuildAssemblyVersion>
8-
<MicroBuildAssemblyFileLanguage>cs</MicroBuildAssemblyFileLanguage>
9-
</PropertyGroup>
10-
<PropertyGroup>
11-
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
12-
<TargetDotnetProfileCondition=" '$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
13-
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin</OutputPath>
14-
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
15-
<ProjectGuid>{C4586A06-1402-48BC-8E35-A1B8642F895B}</ProjectGuid>
6+
<TargetFramework>net46</TargetFramework>
167
<OutputType>Library</OutputType>
17-
<AppDesignerFolder>Properties</AppDesignerFolder>
8+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
189
<RootNamespace>Microsoft.VisualStudio.FSharp.UIResources</RootNamespace>
19-
<AssemblyName>FSharp.UIResources</AssemblyName>
20-
<TargetType>LIBRARY</TargetType>
21-
<UseVsVersion>true</UseVsVersion>
22-
<DefineConstants>$(DefineConstants)</DefineConstants>
23-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
24-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
25-
</PropertyGroup>
26-
<PropertyGroup>
27-
<SignAssembly>true</SignAssembly>
28-
<AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
29-
<DefineConstants>STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)</DefineConstants>
30-
<StrongNames>true</StrongNames>
31-
<DelaySign>true</DelaySign>
3210
</PropertyGroup>
11+
3312
<ItemGroup>
34-
<FilesToLocalizeInclude="$(OutDir)$(AssemblyName).dll">
35-
<TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl</TranslationFile>
36-
<LciCommentFile>$(FSharpSourcesRoot)\..\loc\lci\$(AssemblyName).dll.lci</LciCommentFile>
37-
<HasLceComments>false</HasLceComments>
38-
<InProject>false</InProject>
39-
</FilesToLocalize>
13+
<InternalsVisibleToInclude="FSharp.Editor" />
14+
<InternalsVisibleToInclude="FSharp.LanguageService" />
15+
<InternalsVisibleToInclude="FSharp.ProjectSystem.Base" />
16+
<InternalsVisibleToInclude="FSharp.ProjectSystem.FSharp" />
17+
<InternalsVisibleToInclude="VisualFSharp.Salsa" />
18+
<InternalsVisibleToInclude="VisualFSharp.UnitTests" />
4019
</ItemGroup>
41-
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
20+
4221
<ItemGroup>
4322
<ReferenceInclude="PresentationCore" />
4423
<ReferenceInclude="PresentationFramework" />
45-
<ReferenceInclude="System.Drawing" />
4624
<ReferenceInclude="System" />
4725
<ReferenceInclude="System.Core" />
4826
<ReferenceInclude="System.Data" />
27+
<ReferenceInclude="System.Drawing" />
4928
<ReferenceInclude="System.Windows" />
5029
<ReferenceInclude="System.Xaml" />
5130
<ReferenceInclude="System.Xml" />
5231
<ReferenceInclude="WindowsBase" />
5332
</ItemGroup>
33+
34+
<!-- The following are hacks to allow WPF to build.-->
5435
<ItemGroup>
55-
<CompileInclude="CodeFixesOptionControl.xaml.cs">
56-
<DependentUpon>CodeFixesOptionControl.xaml</DependentUpon>
57-
</Compile>
58-
<CompileInclude="IntegerRangeValidationRule.cs" />
59-
<CompileInclude="LanguageServicePerformanceOptionControl.xaml.cs">
60-
<DependentUpon>LanguageServicePerformanceOptionControl.xaml</DependentUpon>
61-
</Compile>
62-
<CompileInclude="IntelliSenseOptionControl.xaml.cs">
63-
<DependentUpon>IntelliSenseOptionControl.xaml</DependentUpon>
64-
</Compile>
65-
<CompileInclude="InternalsVisibleTo.cs" />
66-
<CompileInclude="QuickInfoOptionControl.xaml.cs">
67-
<DependentUpon>QuickInfoOptionControl.xaml</DependentUpon>
68-
</Compile>
69-
<CompileInclude="Properties\AssemblyInfo.cs" />
70-
<CompileInclude="Strings.Designer.cs">
71-
<AutoGen>True</AutoGen>
72-
<DesignTime>True</DesignTime>
73-
<DependentUpon>Strings.resx</DependentUpon>
74-
</Compile>
36+
<!-- <ApplicationDefinition Include="App.xaml" SubType="Designer" Generator="MSBuild:Compile" />-->
37+
<!-- <Page Include="**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" Exclude="App.xaml" />-->
38+
<PageInclude="**\*.xaml"SubType="Designer"Generator="MSBuild:Compile" />
39+
<NoneInclude="@(Page)" />
40+
<NoneInclude="@(Resource)" />
41+
<CompileUpdate="**\*.xaml.cs"SubType="Designer"DependentUpon="%(Filename)" />
42+
<CompileUpdate="$(IntermediateOutputPath)**\*.g.cs"Visible="false" />
7543
</ItemGroup>
76-
<ItemGroup>
77-
<PageInclude="CodeFixesOptionControl.xaml">
78-
<Generator>MSBuild:Compile</Generator>
79-
<SubType>Designer</SubType>
80-
</Page>
81-
<PageInclude="HyperlinkStyles.xaml">
82-
<Generator>MSBuild:Compile</Generator>
83-
<SubType>Designer</SubType>
84-
</Page>
85-
<PageInclude="LanguageServicePerformanceOptionControl.xaml">
86-
<Generator>MSBuild:Compile</Generator>
87-
<SubType>Designer</SubType>
88-
</Page>
89-
<PageInclude="IntelliSenseOptionControl.xaml">
90-
<SubType>Designer</SubType>
91-
<Generator>MSBuild:Compile</Generator>
92-
</Page>
93-
<PageInclude="OptionPageStyle.xaml">
94-
<Generator>MSBuild:Compile</Generator>
95-
<SubType>Designer</SubType>
96-
</Page>
97-
<PageInclude="QuickInfoOptionControl.xaml">
98-
<Generator>MSBuild:Compile</Generator>
99-
<SubType>Designer</SubType>
100-
</Page>
101-
</ItemGroup>
102-
<ItemGroup>
103-
<EmbeddedResourceInclude="Strings.resx">
104-
<Generator>PublicResXFileCodeGenerator</Generator>
105-
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
106-
<SubType>Designer</SubType>
107-
</EmbeddedResource>
108-
</ItemGroup>
109-
<ImportProject="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
110-
<ImportProject="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
111-
</Project>
44+
45+
<PropertyGroup>
46+
<VSMSBuildBinDir>$(VS150COMNTOOLS)\..\..\MSBuild\$(VisualStudioVersion)\Bin</VSMSBuildBinDir>
47+
<LanguageTargetsCondition="Exists('$(VSMSBuildBinDir)')">$(VSMSBuildBinDir)\Microsoft.CSharp.targets</LanguageTargets>
48+
</PropertyGroup>
49+
50+
<TargetName="WorkaroundForXAMLIntellisenseBuildIssue"AfterTargets="_CheckCompileDesignTimePrerequisite">
51+
<PropertyGroup>
52+
<BuildingProject>false</BuildingProject>
53+
</PropertyGroup>
54+
</Target>
55+
56+
</Project>

‎vsintegration/src/FSharp.UIResources/InternalsVisibleTo.cs‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎vsintegration/src/FSharp.UIResources/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
22

3-
usingSystem;
4-
usingSystem.Reflection;
5-
usingSystem.Runtime.CompilerServices;
63
usingSystem.Runtime.InteropServices;
74

8-
// General Information about an assembly is controlled through the following
9-
// set of attributes. Change these attribute values to modify the information
10-
// associated with an assembly.
11-
[assembly:AssemblyTitle("FSharp.UIResources")]
12-
[assembly:AssemblyDescription("")]
13-
[assembly:AssemblyConfiguration("")]
14-
[assembly:AssemblyCompany("Microsoft.VisualFSharpTools")]
15-
[assembly:AssemblyProduct("FSharp.UIResources")]
16-
[assembly:AssemblyCopyright("Copyright (c) Microsoft Corporation.")]
17-
[assembly:AssemblyTrademark("")]
18-
[assembly:AssemblyCulture("")]
19-
205
// Setting ComVisible to false makes the types in this assembly not visible
216
// to COM components. If you need to access a type in this assembly from
227
// COM, set the ComVisible attribute to true on that type.

0 commit comments

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