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

Commit147e572

Browse files
committed
split swix packages into *.Compiler and *.IDE
These two packages will no longer be dependent upon each other.
1 parent7d53b07 commit147e572

17 files changed

+91
-31
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ ossreadme*.txt
9999
*.csproj.user
100100
*.fsproj.user
101101
*.sln.DotSettings.user
102-
*.ide
103102
*.log
104103
*.jrs
105104
*.chk
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
use vs
2+
3+
package name=Microsoft.FSharp.Compiler
4+
version=$(FSharpPackageVersion)
5+
6+
vs.dependencies
7+
vs.dependency id=Microsoft.FSharp.Dependencies
8+
version=$(FSharpPackageVersion)
9+
type=Required

‎setup/Swix/Microsoft.FSharp.Compiler/Files.swr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use vs
33
package name=Microsoft.FSharp.Compiler
44
version=$(FSharpPackageVersion)
55

6-
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler"
6+
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp"
77
file source="$(BinariesFolder)\net40\bin\fsc.exe" vs.file.ngen=yes
88
file source="$(BinariesFolder)\net40\bin\fsc.exe.config"
99
file source="$(BinariesFolder)\net40\bin\FSharp.Build.dll" vs.file.ngen=yes

‎setup/Swix/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.swixproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
<ItemGroup>
3131
<PackageInclude="Files.swr" />
32+
<PackageInclude="Dependencies.swr" />
3233
</ItemGroup>
3334

3435
<TargetName="CheckPropertiesArePassed">

‎setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,6 @@ package name=Microsoft.FSharp.Dependencies
44
version=$(FSharpPackageVersion)
55

66
vs.dependencies
7-
vs.dependency id=Microsoft.FSharp.Compiler
8-
version=$(FSharpPackageVersion)
9-
type=Required
10-
117
vs.dependency id=Microsoft.FSharp.SDK
128
version=$(FSharpPackageVersion)
139
type=Required
14-
15-
vs.dependency id=Microsoft.FSharp.VSIX.Full.Core
16-
version=$(FSharpPackageVersion)
17-
type=Required
18-
when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community
19-
20-
vs.dependency id=Microsoft.FSharp.VSIX.Full.Resources
21-
version=$(FSharpPackageVersion)
22-
type=Required
23-
when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community

‎setup/Swix/Microsoft.FSharp.Dependencies/Files.swr‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,5 @@ folder "InstallDir:Common7\IDE\PublicAssemblies"
1515
file source="$(BinariesFolder)\net40\bin\FSharp.Core.optdata"
1616
file source="$(BinariesFolder)\net40\bin\FSharp.Core.sigdata"
1717

18-
folder "InstallDir:Common7\IDE\NewScriptItems"
19-
file source="$(BinariesFolder)\setup\resources\NewFileDialog\Script\NewFSharpScriptItems.vsdir"
20-
file source="$(BinariesFolder)\setup\resources\NewFileDialog\Script\Script.fsx"
21-
22-
folder "InstallDir:Common7\IDE\NewFileItems"
23-
file source="$(BinariesFolder)\setup\resources\NewFileDialog\General\NewFSharpFileItems.vsdir"
24-
file source="$(BinariesFolder)\setup\resources\NewFileDialog\General\File.fs"
25-
file source="$(BinariesFolder)\setup\resources\NewFileDialog\General\Script.fsx"
26-
2718
folder "InstallDir:Common7\Tools\VsDevCmd\Ext"
2819
file source="fsharp.bat"

‎setup/Swix/Microsoft.FSharp.Dependencies/fsharp.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if"%VSCMD_TEST%"NEQ""goto :test
22
if"%VSCMD_ARG_CLEAN_ENV%"NEQ""goto :clean_env
33

4-
setFSHARPINSTALLDIR=%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\
4+
setFSHARPINSTALLDIR=%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\FSharp\
55
set"PATH=%FSHARPINSTALLDIR%;%PATH%"
66

77
goto :end
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
use vs
2+
3+
package name=Microsoft.FSharp.IDE
4+
version=$(FSharpPackageVersion)
5+
6+
vs.dependencies
7+
vs.dependency id=Microsoft.FSharp.Dependencies
8+
version=$(FSharpPackageVersion)
9+
type=Required
10+
11+
vs.dependency id=Microsoft.FSharp.VSIX.Full.Core
12+
version=$(FSharpPackageVersion)
13+
type=Required
14+
when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community
15+
16+
vs.dependency id=Microsoft.FSharp.VSIX.Full.Resources
17+
version=$(FSharpPackageVersion)
18+
type=Required
19+
when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
use vs
2+
3+
package name=Microsoft.FSharp.IDE
4+
version=$(FSharpPackageVersion)
5+
6+
folder "InstallDir:Common7\IDE\NewScriptItems"
7+
file source="$(BinariesFolder)\setup\resources\NewFileDialog\Script\NewFSharpScriptItems.vsdir"
8+
file source="$(BinariesFolder)\setup\resources\NewFileDialog\Script\Script.fsx"
9+
10+
folder "InstallDir:Common7\IDE\NewFileItems"
11+
file source="$(BinariesFolder)\setup\resources\NewFileDialog\General\NewFSharpFileItems.vsdir"
12+
file source="$(BinariesFolder)\setup\resources\NewFileDialog\General\File.fs"
13+
file source="$(BinariesFolder)\setup\resources\NewFileDialog\General\Script.fsx"
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
3+
<ProjectInitialTargets="CheckPropertiesArePassed"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4+
<PropertyGroup>
5+
<FSharpSourcesRoot>$(MSBuildThisFileDirectory)..\..\..\src</FSharpSourcesRoot>
6+
<OutputArchitecture>neutral</OutputArchitecture>
7+
<OutputLocalized>false</OutputLocalized>
8+
<OutputType>vsix</OutputType>
9+
<IsPackage>true</IsPackage>
10+
<ConfigurationCondition="'$(Configuration)' == ''">Debug</Configuration>
11+
<BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
12+
<PackagesFolder>$(FSharpSourcesRoot)\..\packages</PackagesFolder>
13+
<OutputPath>$(BinariesFolder)\insertion</OutputPath>
14+
<OutputName>Microsoft.FSharp.IDE</OutputName>
15+
<IntermediateOutputPath>$(MSBuildThisFileDirectory)obj</IntermediateOutputPath>
16+
</PropertyGroup>
17+
18+
<ImportProject="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
19+
20+
<PropertyGroup>
21+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
22+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);PackagesFolder=$(PackagesFolder)</PackagePreprocessorDefinitions>
23+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
24+
</PropertyGroup>
25+
26+
<ItemGroup>
27+
<PackageInclude="Files.swr" />
28+
<PackageInclude="Dependencies.swr" />
29+
</ItemGroup>
30+
31+
<TargetName="CheckPropertiesArePassed">
32+
<ErrorCondition="'$(FSharpPackageVersion)' == ''"Text="A 'FSharpPackageVersion' property must be passed to the project." />
33+
</Target>
34+
35+
<TargetName="SignFiles">
36+
<!-- Signing is handled by the RoslynSignTool-->
37+
</Target>
38+
</Project>

0 commit comments

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