Skip to content

Merge master to nullness #6589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Apr 20, 2019
Merged

Merge master to nullness #6589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fadd9e
rearrange order of SWR files to fix dependencies (#6582)
brettfo Apr 19, 2019
c4c1d9c
combine swr files (#6587)
brettfo Apr 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
</ItemGroup>

<ItemGroup>
<SwrFile Include="Files.swr" />
<SwrFile Include="Dependencies.swr" />
<SwrFile Include="Package.swr" />
</ItemGroup>

</Project>
5 changes: 5 additions & 0 deletions ...x/Microsoft.FSharp.Dependencies/Files.swr → ...Microsoft.FSharp.Dependencies/Package.swr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ use vs
package name=Microsoft.FSharp.Dependencies
version=$(VsixVersion)

vs.dependencies
vs.dependency id=Microsoft.FSharp.SDK
version=$(VsixVersion)
type=Required

folder "InstallDir:MSBuild\Microsoft\VisualStudio\v$(VSGeneralVersion)\FSharp"
file "Microsoft.FSharp.targets" source="$(SetupShimsDir)\Microsoft.FSharp.Shim.targets"
file "Microsoft.Portable.FSharp.targets" source="$(SetupShimsDir)\Microsoft.Portable.FSharp.Shim.targets"
Expand Down
19 changes: 0 additions & 19 deletions setup/Swix/Microsoft.FSharp.IDE/Dependencies.swr
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
</ItemGroup>

<ItemGroup>
<SwrFile Include="Files.swr" />
<SwrFile Include="Dependencies.swr" />
<SwrFile Include="Package.swr" />
</ItemGroup>

</Project>
10 changes: 10 additions & 0 deletions setup/Swix/Microsoft.FSharp.IDE/Files.swr → setup/Swix/Microsoft.FSharp.IDE/Package.swr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ use vs
package name=Microsoft.FSharp.IDE
version=$(VsixVersion)

vs.dependencies
vs.dependency id=Microsoft.FSharp.Dependencies
version=$(VsixVersion)
type=Required

vs.dependency id=Microsoft.FSharp.VSIX.Full.Core
version=$(VsixVersion)
type=Required
when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community

folder "InstallDir:Common7\IDE\NewScriptItems"
file source="$(SetupResourcesDir)\NewFileDialog\Script\NewFSharpScriptItems.vsdir"
file source="$(SetupResourcesDir)\NewFileDialog\Script\Script.fsx"
Expand Down