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

Commit9458819

Browse files
authored
Merge pull requestdotnet#4510 from brettfo/vsix-open-source
remove VisualFSharpOpenSource package
2 parents211286f +230bd03 commit9458819

File tree

12 files changed

+9
-317
lines changed

12 files changed

+9
-317
lines changed

‎DEVGUIDE.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,18 +156,18 @@ components installed in that VS installation. You can revert this step by disab
156156
For**Debug**, uninstall then reinstall:
157157

158158
VSIXInstaller.exe /u:"VisualFSharp"
159-
VSIXInstaller.exe debug\net40\bin\VisualFSharpOpenSource.vsix
159+
VSIXInstaller.exe debug\net40\bin\VisualFSharpFull.vsix
160160

161161
For**Release**, uninstall then reinstall:
162162

163163
VSIXInstaller.exe /u:"VisualFSharp"
164-
VSIXInstaller.exe release\net40\bin\VisualFSharpOpenSource.vsix
164+
VSIXInstaller.exe release\net40\bin\VisualFSharpFull.vsix
165165

166166
Restart Visual Studio, it should now be running your freshly-built Visual F# IDE Tools with updated F# Interactive.
167167

168168
####[Optional] F5 testing of local changes
169169

170-
To test your changes locally_without_ overwriting your default installed Visual F# tools, set the`VisualFSharp\Vsix\VisualFSharpOpenSource`
170+
To test your changes locally_without_ overwriting your default installed Visual F# tools, set the`VisualFSharp\Vsix\VisualFSharpFull`
171171
project as the startup project. When you hit F5 a new instance of Visual Studio will be started in the`RoslynDev` hive with your
172172
changes, but the root (default) hive will remain untouched. You can also start this hive automatically using
173173

‎VisualFSharp.sln‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vsix", "Vsix", "{141F6C23-E
116116
EndProject
117117
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="VisualFSharpFull","vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj","{59ADCE46-9740-4079-834D-9A03A3494EBC}"
118118
EndProject
119-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="VisualFSharpOpenSource","vsintegration\Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj","{E6A45CDF-B408-420F-B475-74611BEFC52B}"
120-
EndProject
121119
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="HostedCompilerServer","tests\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj","{4239EFEA-E746-446A-BF7A-51FCBAB13946}"
122120
EndProject
123121
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="ILComparer","tests\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj","{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}"
@@ -484,14 +482,6 @@ Global
484482
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|Any CPU.Build.0=Release|Any CPU
485483
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|x86.ActiveCfg=Release|Any CPU
486484
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|x86.Build.0=Release|Any CPU
487-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
488-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|Any CPU.Build.0=Debug|Any CPU
489-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|x86.ActiveCfg=Debug|Any CPU
490-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|x86.Build.0=Debug|Any CPU
491-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|Any CPU.ActiveCfg=Release|Any CPU
492-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|Any CPU.Build.0=Release|Any CPU
493-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|x86.ActiveCfg=Release|Any CPU
494-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|x86.Build.0=Release|Any CPU
495485
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
496486
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Debug|Any CPU.Build.0=Debug|Any CPU
497487
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Debug|x86.ActiveCfg=Debug|Any CPU
@@ -616,7 +606,6 @@ Global
616606
{1FB1DD07-06AA-45B4-B5AC-20FF5BEE98B6} ={F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
617607
{141F6C23-E1B1-4D89-9F10-F0B8AD58E71F} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
618608
{59ADCE46-9740-4079-834D-9A03A3494EBC} ={141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
619-
{E6A45CDF-B408-420F-B475-74611BEFC52B} ={141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
620609
{4239EFEA-E746-446A-BF7A-51FCBAB13946} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
621610
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
622611
{D086C8C6-D00D-4C3B-9AB2-A4286C9F5922} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}

‎build/config/AssemblySignToolData.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
"values": [
5151
"net40\\bin\\VisualFSharpFull.vsix",
5252
"net40\\bin\\VisualFSharpTemplate.vsix",
53-
"net40\\bin\\VisualFSharpOpenSource.vsix",
5453
"insertion\\Microsoft.FSharp.Dependencies.vsix",
5554
"insertion\\Microsoft.FSharp.VSIX.Full.Resources.*.vsix"
5655
]

‎build/targets/AssemblyVersions.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
<BuildTimeStamp_Date>$(BUILD_BUILDNUMBER.Split('.')[0].Substring(2))</BuildTimeStamp_Date>
4747
<BuildTimeStamp_Number>$(BUILD_BUILDNUMBER.Split('.')[1].PadLeft(2, '0'))</BuildTimeStamp_Number>
4848
<BuildTimeStamp>$(BuildTimeStamp_Date)$(BuildTimeStamp_Number)</BuildTimeStamp>
49-
<VsixPackageVersion>$(VSAssemblyVersion.Split('.')[0]).$(VSAssemblyVersion.Split('.')[1]).$(BUILD_BUILDNUMBER)</VsixPackageVersion>
49+
<VsixPackageVersionCondition="'$(CI)' != ''">$(VSAssemblyVersion.Split('.')[0]).$(VSAssemblyVersion.Split('.')[1]).$(BUILD_BUILDNUMBER)</VsixPackageVersion>
50+
<VsixPackageVersionCondition="'$(CI)' == ''">42.42.42.42</VsixPackageVersion>
5051
<NuGetPackageVersionSuffix>$(BuildTimeStamp_Date)-$(BuildTimeStamp_Number)</NuGetPackageVersionSuffix>
5152
</PropertyGroup>
5253

‎setup/fsharp-setup-build.proj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<VsixProjectsInclude="VisualFSharpFull.csproj">
1717
<ProjectPath>..\vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj</ProjectPath>
1818
</VsixProjects>
19-
<VsixProjectsInclude="VisualFSharpOpenSource.csproj">
20-
<ProjectPath>..\vsintegration\Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj</ProjectPath>
21-
</VsixProjects>
2219
<VsixProjectsInclude="VisualFSharpTemplates.csproj">
2320
<ProjectPath>..\vsintegration\Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj</ProjectPath>
2421
</VsixProjects>

‎vsintegration/Vsix/VisualFSharpFull/Properties/launchSettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"profiles": {
3-
"VisualFSharpOpenSource": {
3+
"VisualFSharpFull": {
44
"commandName":"Executable",
55
"executablePath":"$(DevEnvDir)devenv.exe",
66
"commandLineArgs":"/rootsuffix $(VSSDKTargetPlatformRegRootSuffix) /log"

‎vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<OutputType>Library</OutputType>
88
<ExtensionInstallationFolder>Microsoft\FSharp</ExtensionInstallationFolder>
99
<PackageTargetFallback>netcoreapp1.0</PackageTargetFallback>
10-
<DeployExtension>false</DeployExtension>
1110
</PropertyGroup>
1211

1312
<ItemGroup>

‎vsintegration/Vsix/VisualFSharpOpenSource/Properties/launchSettings.json‎

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

‎vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest‎

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

0 commit comments

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