Skip to content

Merge master to dev16.1 #6252

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
brettfo merged 7 commits into from
Feb 19, 2019
Merged

Merge master to dev16.1 #6252

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1bbb60a
fix package signing (#6207) (#6208)
brettfo Feb 7, 2019
84f7488
We don't ever set the value FCS_RETAIN_BACKGROUND_PARSE_RESULTS (#6212)
KevinRansom Feb 8, 2019
31a98b9
Ensure core tests pick up fsharp.core nuget packages from artifacts b…
KevinRansom Feb 8, 2019
b88055c
Update mono props: support OSX and more .NET Framework versions (#6181)
baronfel Feb 13, 2019
54c22cd
fix double-build of vsix packages (#6233)
brettfo Feb 17, 2019
7376e22
debug fixes (#6170)
dsyme Feb 19, 2019
fc15661
Merge branch 'dev16.1' into merges/master-to-dev16.1
brettfo Feb 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
Prev Previous commit
Next Next commit
fix double-build of vsix packages (#6233) 
* fix double-build of vsix packages (#6232)

* Update Microsoft.FSharp.vsmanproj
  • Loading branch information
@brettfo @KevinRansom
brettfo authored and KevinRansom committed Feb 17, 2019
commit 54c22cdea6e069db28d8dd16723e402e364aab44
2 changes: 1 addition & 1 deletion build/config/AssemblySignToolData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"certificate": "VsixSHA2",
"strongName": null,
"values": [
"bin\\VisualFSharpFull\\*\\*VisualFSharpFull.vsix",
"bin\\VisualFSharpFull\\*\\*\\VisualFSharpFull.vsix",
"bin\\VisualFSharpTemplates\\*\\*\\VisualFSharpTemplate.vsix",
"VSSetup\\*\\Insertion\\Microsoft.FSharp.Dependencies.vsix",
"VSSetup\\*\\Insertion\\Microsoft.FSharp.VSIX.Full.Resources.*.vsix"
Expand Down
5 changes: 3 additions & 2 deletions fsharp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@
<Projects Include="$(MSBuildThisFileDirectory)vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj" />
<Projects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-item-templates-build.proj" />
<Projects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-project-templates-build.proj" />
<VsixProjects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-vsix-build.proj" />
<VsixProjects Include="$(MSBuildThisFileDirectory)\vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj" />
<VsixProjects Include="$(MSBuildThisFileDirectory)\vsintegration\Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(BuildCompiler)' == 'true' OR '$(BuildNuget)' == 'true' OR '$(BuildVS)' == 'true' OR '$(_RunningRestore)' == 'true'">
Expand All @@ -110,7 +111,7 @@
</ItemGroup>

<ItemGroup Condition="'$(BuildSetup)' == 'true' OR '$(_RunningRestore)' == 'true'">
<SetupProjects Include="$(MSBuildThisFileDirectory)setup\fsharp-setup-build.csproj" />
<SetupProjects Include="$(MSBuildThisFileDirectory)setup\fsharp-setup-build.csproj" />
</ItemGroup>

<!-- test binaries -->
Expand Down
8 changes: 4 additions & 4 deletions setup/Swix/Microsoft.FSharp.vsmanproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
</PropertyGroup>

<ItemGroup>
<InsertionItems Include="$(VsixBuildLocation)\VisualFSharpFull.vsix" />
<InsertionItems Include="$(VsixBuildLocation)\VisualFSharpTemplate.vsix" />
<InsertionItems Include="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Full.Core.json" />
<InsertionItems Include="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Templates.json" />
<InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpFull\$(Configuration)\net46\VisualFSharpFull.vsix" />
<InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpFull\$(Configuration)\net46\Microsoft.FSharp.VSIX.Full.Core.json" />
<InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpTemplates\$(Configuration)\net46\VisualFSharpTemplate.vsix" />
<InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpTemplates\$(Configuration)\net46\Microsoft.FSharp.VSIX.Templates.json" />
</ItemGroup>

<Target Name="CopyInsertionItems">
Expand Down
12 changes: 0 additions & 12 deletions setup/fsharp-setup-build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,6 @@
</ItemGroup>

<Target Name="CollectSetupProjects">
<ItemGroup>
<VsixProjects Include="VisualFSharpFull.csproj">
<ProjectPath>..\vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj</ProjectPath>
</VsixProjects>
<VsixProjects Include="VisualFSharpTemplates.csproj">
<ProjectPath>..\vsintegration\Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj</ProjectPath>
</VsixProjects>
</ItemGroup>

<CreateItem Include="@(SetupLanguages)"
AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj">
<Output ItemName="SwixSetupProjects" TaskParameter="Include" />
Expand Down Expand Up @@ -59,9 +50,6 @@
<PropertyGroup>
<CustomProps>AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</CustomProps>
</PropertyGroup>
<MSBuild Projects="%(VsixProjects.ProjectPath)"
Targets="Build"
Properties="Configuration=$(Configuration);IsLangPack=%(VsixProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);OutputPath=$(VsixBuildLocation);DisableOutputPathCopying=true;$(CustomProps)" />
<MSBuild Projects="%(SwixSetupProjects.ProjectPath)"
Targets="Build"
Properties="LocaleCode=%(SwixSetupProjects.LocaleCode);LocaleId=%(SwixSetupProjects.LocaleId);LocaleParentId=%(SwixSetupProjects.LocaleParentId);LocaleParentCulture=%(SwixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SwixSetupProjects.LocaleSpecificCulture);IsLangPack=%(SwixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);VSGeneralVersion=$(VSGeneralVersion);TargetFramework=$(TargetFramework);$(CustomProps)"/>
Expand Down