Skip to content

Commit efeea76

Browse files
authored
create DependentAssemblyVersions.csv to help with VS insertions (#6659)
1 parent ff1d3d1 commit efeea76

File tree

4 files changed

+36
-2
lines changed

4 files changed

+36
-2
lines changed

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
<MicroBuildPluginsSwixBuildPackageVersion>1.0.147</MicroBuildPluginsSwixBuildPackageVersion>
169169
<!-- other packages -->
170170
<FsCheckPackageVersion>3.0.0-alpha4</FsCheckPackageVersion>
171+
<FSharpDataTypeProvidersVersion>4.3.0.0</FSharpDataTypeProvidersVersion>
171172
<MicrosoftCompositionPackageVersion>1.0.30</MicrosoftCompositionPackageVersion>
172173
<MicrosoftMSXMLPackageVersion>8.0.0-alpha</MicrosoftMSXMLPackageVersion>
173174
<MicrosoftNetCompilersPackageVersion>2.7.0</MicrosoftNetCompilersPackageVersion>

setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp"
9999
file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\FSharp.Core.optdata"
100100
file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\FSharp.Core.sigdata"
101101
file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\$(TargetFramework)\FSharp.Build.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
102-
file source="$(NuGetPackageRoot)\Microsoft.VisualFSharp.Type.Providers.Redist\$(MicrosoftVisualFSharpTypeProvidersRedistPackageVersion)\content\4.3.0.0\FSharp.Data.TypeProviders.dll"
102+
file source="$(NuGetPackageRoot)\Microsoft.VisualFSharp.Type.Providers.Redist\$(MicrosoftVisualFSharpTypeProvidersRedistPackageVersion)\content\$(FSharpDataTypeProvidersVersion)\FSharp.Data.TypeProviders.dll"
103103
file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\$(TargetFramework)\Microsoft.Build.dll"
104104
file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\$(TargetFramework)\Microsoft.Build.Framework.dll"
105105
file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\$(TargetFramework)\Microsoft.Build.Tasks.Core.dll"

setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,37 @@
1313
<SwrFile Include="Package.swr" />
1414
</ItemGroup>
1515

16+
<ItemGroup>
17+
<_Dependency Include="FSharp.Build" Version="$(FSProductVersion)" />
18+
<_Dependency Include="FSharp.Compiler.Interactive.Settings" Version="$(FSProductVersion)" />
19+
<_Dependency Include="FSharp.Compiler.Private" Version="$(FSProductVersion)" />
20+
<_Dependency Include="FSharp.Compiler.Server.Shared" Version="$(FSProductVersion)" />
21+
<_Dependency Include="FSharp.Core" Version="$(FSCoreVersion)" />
22+
<_Dependency Include="FSharp.Data.TypeProviders" Version="$(FSharpDataTypeProvidersVersion)" />
23+
<_Dependency Include="FSharp.Editor" Version="$(VSAssemblyVersion)" />
24+
<_Dependency Include="FSharp.LanguageService.Base" Version="$(VSAssemblyVersion)" />
25+
<_Dependency Include="FSharp.LanguageService" Version="$(VSAssemblyVersion)" />
26+
<_Dependency Include="FSharp.PatternMatcher" Version="$(VSAssemblyVersion)" />
27+
<_Dependency Include="FSharp.ProjectSystem.Base" Version="$(VSAssemblyVersion)" />
28+
<_Dependency Include="FSharp.ProjectSystem.FSharp" Version="$(VSAssemblyVersion)" />
29+
<_Dependency Include="FSharp.ProjectSystem.PropertyPages" Version="$(VSAssemblyVersion)" />
30+
<_Dependency Include="FSharp.UIResources" Version="$(VSAssemblyVersion)" />
31+
<_Dependency Include="FSharp.VS.FSI" Version="$(VSAssemblyVersion)" />
32+
</ItemGroup>
33+
34+
<Target Name="GenerateDependentAssemblyVersions"
35+
AfterTargets="Build">
36+
<PropertyGroup>
37+
<DevDivPackagesDir>$(InsertionDir)\DevDivPackages</DevDivPackagesDir>
38+
<DependentAssemblyVersionsFile>$(DevDivPackagesDir)\DependentAssemblyVersions.csv</DependentAssemblyVersionsFile>
39+
</PropertyGroup>
40+
41+
<MakeDir Directories="$(DevDivPackagesDir)" />
42+
<WriteLinesToFile Lines="@(_Dependency->'%(Identity),%(Version)')" File="$(DependentAssemblyVersionsFile)" Overwrite="true" />
43+
44+
<ItemGroup>
45+
<FileWrites Include="$(DependentAssemblyVersionsFile)" />
46+
</ItemGroup>
47+
</Target>
48+
1649
</Project>

vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<Link>License.txt</Link>
2424
<IncludeInVSIX>true</IncludeInVSIX>
2525
</Content>
26-
<Content Include="$(NuGetPackageRoot)\Microsoft.VisualFSharp.Type.Providers.Redist\$(MicrosoftVisualFSharpTypeProvidersRedistPackageVersion)\content\4.3.0.0\FSharp.Data.TypeProviders.dll">
26+
<Content Include="$(NuGetPackageRoot)\Microsoft.VisualFSharp.Type.Providers.Redist\$(MicrosoftVisualFSharpTypeProvidersRedistPackageVersion)\content\$(FSharpDataTypeProvidersVersion)\FSharp.Data.TypeProviders.dll">
2727
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2828
<Link>FSharp.Data.TypeProviders.dll</Link>
2929
<IncludeInVSIX>true</IncludeInVSIX>

0 commit comments

Comments
 (0)