diff --git a/eng/Versions.props b/eng/Versions.props index 6fecc6c033f..e8a90e3946c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,6 +168,7 @@ 1.0.147 3.0.0-alpha4 + 4.3.0.0 1.0.30 8.0.0-alpha 2.7.0 diff --git a/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj b/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj index c0b0eff808e..a702f827717 100644 --- a/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj +++ b/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj @@ -99,7 +99,7 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp" file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\FSharp.Core.optdata" file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\FSharp.Core.sigdata" file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\$(TargetFramework)\FSharp.Build.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2 - file source="$(NuGetPackageRoot)\Microsoft.VisualFSharp.Type.Providers.Redist\$(MicrosoftVisualFSharpTypeProvidersRedistPackageVersion)\content\4.3.0.0\FSharp.Data.TypeProviders.dll" + file source="$(NuGetPackageRoot)\Microsoft.VisualFSharp.Type.Providers.Redist\$(MicrosoftVisualFSharpTypeProvidersRedistPackageVersion)\content\$(FSharpDataTypeProvidersVersion)\FSharp.Data.TypeProviders.dll" file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\$(TargetFramework)\Microsoft.Build.dll" file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\$(TargetFramework)\Microsoft.Build.Framework.dll" file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\$(TargetFramework)\Microsoft.Build.Tasks.Core.dll" diff --git a/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj b/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj index a454fc2c606..03d9cf42ba6 100644 --- a/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj +++ b/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj @@ -13,4 +13,37 @@ + + <_Dependency Include="FSharp.Build" Version="$(FSProductVersion)" /> + <_Dependency Include="FSharp.Compiler.Interactive.Settings" Version="$(FSProductVersion)" /> + <_Dependency Include="FSharp.Compiler.Private" Version="$(FSProductVersion)" /> + <_Dependency Include="FSharp.Compiler.Server.Shared" Version="$(FSProductVersion)" /> + <_Dependency Include="FSharp.Core" Version="$(FSCoreVersion)" /> + <_Dependency Include="FSharp.Data.TypeProviders" Version="$(FSharpDataTypeProvidersVersion)" /> + <_Dependency Include="FSharp.Editor" Version="$(VSAssemblyVersion)" /> + <_Dependency Include="FSharp.LanguageService.Base" Version="$(VSAssemblyVersion)" /> + <_Dependency Include="FSharp.LanguageService" Version="$(VSAssemblyVersion)" /> + <_Dependency Include="FSharp.PatternMatcher" Version="$(VSAssemblyVersion)" /> + <_Dependency Include="FSharp.ProjectSystem.Base" Version="$(VSAssemblyVersion)" /> + <_Dependency Include="FSharp.ProjectSystem.FSharp" Version="$(VSAssemblyVersion)" /> + <_Dependency Include="FSharp.ProjectSystem.PropertyPages" Version="$(VSAssemblyVersion)" /> + <_Dependency Include="FSharp.UIResources" Version="$(VSAssemblyVersion)" /> + <_Dependency Include="FSharp.VS.FSI" Version="$(VSAssemblyVersion)" /> + + + + + $(InsertionDir)\DevDivPackages + $(DevDivPackagesDir)\DependentAssemblyVersions.csv + + + + + + + + + + diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj index f5aad374baa..dc670ae39f3 100644 --- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj +++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj @@ -23,7 +23,7 @@ License.txt true - + PreserveNewest FSharp.Data.TypeProviders.dll true