Skip to content

Automate Roslyn Dependency Management with Darc & Prune Direct References #18957

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
merged 36 commits into from
Oct 10, 2025
Merged

Automate Roslyn Dependency Management with Darc & Prune Direct References #18957

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
652ffd4
Move Roslyn deps from manually managed to darc
T-Gro Oct 2, 2025
7b66dab
Cascade of consequences
T-Gro Oct 2, 2025
e2c7e15
no nuget errors, lets see what VS integration says
T-Gro Oct 2, 2025
ea47316
un-harcode csc,ildasm,ilasm deps for testframework
T-Gro Oct 2, 2025
b1cac50
Apply suggestion from @T-Gro
T-Gro Oct 3, 2025
26cba53
Merge branch 'main' into move-roslyn-deps-to-darc
T-Gro Oct 3, 2025
04328fe
VSSDK Build Tools
T-Gro Oct 3, 2025
1e132ee
Merge branch 'move-roslyn-deps-to-darc' of https://github.com/dotnet/…
T-Gro Oct 3, 2025
d447a30
adapt roslyn api change
T-Gro Oct 3, 2025
fcb3ef6
Update LanguageService.fs
T-Gro Oct 3, 2025
764ec3e
Fix CI crashes
T-Gro Oct 3, 2025
919cd34
drastically reduce direct package references for vsintegration to avo…
T-Gro Oct 6, 2025
c4d3f8d
Remove unneeded versions
T-Gro Oct 6, 2025
0acdf75
Apply suggestion from @T-Gro
T-Gro Oct 6, 2025
47af8e9
Apply suggestion from @T-Gro
T-Gro Oct 6, 2025
44e506d
Apply suggestion from @T-Gro
T-Gro Oct 6, 2025
9f7a2a9
Apply suggestion from @T-Gro
T-Gro Oct 6, 2025
5061325
Apply suggestion from @T-Gro
T-Gro Oct 6, 2025
473d109
Apply suggestion from @T-Gro
T-Gro Oct 6, 2025
0d72745
Apply suggestion from @T-Gro
T-Gro Oct 6, 2025
524fe2f
Apply suggestion from @T-Gro
T-Gro Oct 6, 2025
5196aa9
Apply suggestion from @T-Gro
T-Gro Oct 6, 2025
98eeb7d
Apply suggestion from @T-Gro
T-Gro Oct 6, 2025
bc98438
Apply suggestion from @T-Gro
T-Gro Oct 6, 2025
762e70d
Merge branch 'main' into move-roslyn-deps-to-darc
T-Gro Oct 6, 2025
ae19f7c
Modify System.Collections.Immutable reference
T-Gro Oct 6, 2025
a976beb
Apply suggestion from @T-Gro
T-Gro Oct 6, 2025
dae0174
Apply suggestion from @T-Gro
T-Gro Oct 6, 2025
4b121a9
Update FSharp.Test.Utilities.fsproj
T-Gro Oct 6, 2025
f8de2ed
showImmutableVersion
T-Gro Oct 7, 2025
b7c5cb4
what is wrong with System.Collections.Immutable.ImmutableArray.Create
T-Gro Oct 7, 2025
847c67e
Reduce duplicate test deps, downgrade roslyn used for testing (keep h…
T-Gro Oct 9, 2025
ad58401
Avoid xunit catastrophic failure caused by testcollection ID
T-Gro Oct 9, 2025
3005bd1
IDE tests - enforce roslyn version matching editor components
T-Gro Oct 9, 2025
f54f787
remove obsolete prop
T-Gro Oct 9, 2025
fedc12b
workaround xunit bug that treat displayname as if it were a unique ID
T-Gro Oct 9, 2025
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
32 changes: 32 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,38 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25480.7">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.0.0-2.25480.7">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-2.25480.7">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-2.25480.7">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-2.25480.7">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25480.7">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.0.0-2.25480.7">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-2.25480.7">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25426.3">
Expand Down
70 changes: 20 additions & 50 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,105 +93,75 @@
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
<!-- Versions for package groups -->
<RoslynVersion>5.0.0-1.25276.102</RoslynVersion>
<VisualStudioEditorPackagesVersion>17.14.188</VisualStudioEditorPackagesVersion>
<MicrosoftVisualStudioShellPackagesVersion>17.14.40268</MicrosoftVisualStudioShellPackagesVersion>
<VisualStudioProjectSystemPackagesVersion>17.14.79</VisualStudioProjectSystemPackagesVersion>
<VisualStudioShellProjectsPackages>17.14.40254</VisualStudioShellProjectsPackages>
<MicrosoftVisualStudioThreadingPackagesVersion>17.14.15</MicrosoftVisualStudioThreadingPackagesVersion>
<VisualStudioEditorPackagesVersion>18.0.332-preview</VisualStudioEditorPackagesVersion>
<MicrosoftVisualStudioShellPackagesVersion>18.0.2101-preview.1</MicrosoftVisualStudioShellPackagesVersion>
<VisualStudioProjectSystemPackagesVersion>18.0.1237-pre</VisualStudioProjectSystemPackagesVersion>
<VisualStudioShellProjectsPackages>18.0.2077-preview.1</VisualStudioShellProjectsPackages>
<MicrosoftVisualStudioThreadingPackagesVersion>18.0.5</MicrosoftVisualStudioThreadingPackagesVersion>

<!-- Roslyn packages -->
<MicrosoftCodeAnalysisFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisFeaturesVersion>
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfVersion>5.0.0-1.25275.2</MicrosoftCodeAnalysisEditorFeaturesWpfVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisExternalAccessFSharpVersion>
<MicrosoftCodeAnalysisVersion>$(RoslynVersion)</MicrosoftCodeAnalysisVersion>
<MicrosoftCodeAnalysisCSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftVisualStudioLanguageServicesVersion>$(RoslynVersion)</MicrosoftVisualStudioLanguageServicesVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisExternalAccessFSharpVersion>
<MicrosoftCodeAnalysisVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisVersion>
<MicrosoftCodeAnalysisCSharpVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftVisualStudioLanguageServicesVersion>5.0.0-2.25480.7</MicrosoftVisualStudioLanguageServicesVersion>
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.28</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
<MicrosoftCodeAnalysisCompilersVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCompilersVersion>
<!-- -->
<!-- Visual Studio Shell packages -->
<MicrosoftVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropVersion>
<MicrosoftInternalVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropVersion>
<MicrosoftVisualStudioImagingInterop140DesignTimeVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioImagingInterop140DesignTimeVersion>
<MicrosoftVisualStudioImageCatalogVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioImageCatalogVersion>
<MicrosoftVisualStudioShellInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellInteropVersion>
<MicrosoftVisualStudioTextManagerInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioTextManagerInteropVersion>
<MicrosoftVisualStudioOLEInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioOLEInteropVersion>
<MicrosoftVisualStudioShell150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150Version>
<MicrosoftVisualStudioShellDesignVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellDesignVersion>
<MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>
<MicrosoftInternalVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioShellFrameworkVersion>
<MicrosoftVisualStudioPackageLanguageService150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioPackageLanguageService150Version>
<MicrosoftVisualStudioManagedInterfacesVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioManagedInterfacesVersion>
<MicrosoftVisualStudioProjectAggregatorVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioProjectAggregatorVersion>
<MicrosoftVisualStudioGraphModelVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioGraphModelVersion>
<MicrosoftVisualStudioImagingVersion>17.14.40270</MicrosoftVisualStudioImagingVersion>
<MicrosoftVisualStudioDesignerInterfacesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioDesignerInterfacesVersion>
<MicrosoftVisualStudioUtilitiesVersion>17.14.40270</MicrosoftVisualStudioUtilitiesVersion>
<MicrosoftVisualStudioShellImmutable100Version>10.0.30319</MicrosoftVisualStudioShellImmutable100Version>
<MicrosoftVisualStudioShellImmutable110Version>11.0.50727</MicrosoftVisualStudioShellImmutable110Version>
<MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>

<!-- -->
<!-- Visual Studio Editor packages -->
<MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
<MicrosoftVisualStudioEditorVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioEditorVersion>
<MicrosoftVisualStudioLanguageStandardClassificationVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageStandardClassificationVersion>
<MicrosoftVisualStudioLanguageVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageVersion>
<MicrosoftVisualStudioLanguageIntellisenseVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageIntellisenseVersion>
<MicrosoftVisualStudioPlatformVSEditorVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioPlatformVSEditorVersion>
<MicrosoftVisualStudioTextUIVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIVersion>
<MicrosoftVisualStudioTextUIWpfVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIWpfVersion>
<MicrosoftVisualStudioTextDataVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextDataVersion>
<MicrosoftVisualStudioTextInternalVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextInternalVersion>
<MicrosoftVisualStudioComponentModelHostVersion>17.14.106</MicrosoftVisualStudioComponentModelHostVersion>
<NuGetSolutionRestoreManagerInteropVersion>5.6.0</NuGetSolutionRestoreManagerInteropVersion>
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.169-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.800-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
<MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>$(MicrosoftVisualStudioExtensibilityTestingVersion)</MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>
<MicrosoftVisualStudioExtensibilityTestingXunitVersion>$(MicrosoftVisualStudioExtensibilityTestingVersion)</MicrosoftVisualStudioExtensibilityTestingXunitVersion>
<!-- -->
<!-- Visual Studio Threading packags -->

<!-- Visual Studio Threading packages -->
<MicrosoftVisualStudioThreadingVersion>$(MicrosoftVisualStudioThreadingPackagesVersion)</MicrosoftVisualStudioThreadingVersion>
<!-- -->

<!-- Visual Studio Project System packages-->
<MicrosoftVisualStudioProjectSystemVersion>$(VisualStudioProjectSystemPackagesVersion)</MicrosoftVisualStudioProjectSystemVersion>
<MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
<!-- -->

<!-- Misc. Visual Studio packages -->
<MicrosoftVSSDKBuildToolsVersion>17.10.2179</MicrosoftVSSDKBuildToolsVersion>
<MicrosoftVisualStudioRpcContractsVersion>17.14.20</MicrosoftVisualStudioRpcContractsVersion>
<MicrosoftVSSDKBuildToolsVersion>17.14.2120</MicrosoftVSSDKBuildToolsVersion>
<MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>17.0.0</MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>
<MicrosoftVisualStudioValidationVersion>17.8.8</MicrosoftVisualStudioValidationVersion>
<VSSDKDebuggerVisualizersVersion>12.0.4</VSSDKDebuggerVisualizersVersion>
<VSSDKVSLangProjVersion>7.0.4</VSSDKVSLangProjVersion>
<VSSDKVSLangProj8Version>8.0.4</VSSDKVSLangProj8Version>
<VSSDKVSLangProj11Version>11.0.4</VSSDKVSLangProj11Version>
<VSSDKVSHelpVersion>7.0.4</VSSDKVSHelpVersion>
<!-- -->
<!-- setup packages -->
<MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
<MicroBuildCoreSentinelVersion>1.0.0</MicroBuildCoreSentinelVersion>
<MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>
<MicroBuildPluginsSwixBuildVersion>1.1.87</MicroBuildPluginsSwixBuildVersion>
<!-- -->
<!-- other packages -->
<BenchmarkDotNetVersion>0.13.10</BenchmarkDotNetVersion>
<FsCheckVersion>2.16.5</FsCheckVersion>
<FSharpDataTypeProvidersVersion>4.3.0.0</FSharpDataTypeProvidersVersion>
<MicrosoftCompositionVersion>1.0.31</MicrosoftCompositionVersion>
<MicrosoftNetCompilersVersion>4.3.0-1.22220.8</MicrosoftNetCompilersVersion>
<MicrosoftNETCoreAppRefVersion>3.1.0</MicrosoftNETCoreAppRefVersion>
<!-- Making diff way too large, update separately later. e.g. to 6.0.0-rtm.21518.12 and 9.0.0-rc.2.24462.10 or via darc -->
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETTestSdkVersion>17.11.1</MicrosoftNETTestSdkVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
<RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
<StreamJsonRpcVersion>2.22.11</StreamJsonRpcVersion>
<NerdbankStreamsVersion>2.12.87</NerdbankStreamsVersion>
<XUnitVersion>2.9.0</XUnitVersion>
<XUnitRunnerVersion>2.8.2</XUnitRunnerVersion>
<XunitXmlTestLoggerVersion>3.1.17</XunitXmlTestLoggerVersion>
<HumanizerCoreVersion>2.2.0</HumanizerCoreVersion>
<!-- -->
</PropertyGroup>
</Project>
6 changes: 4 additions & 2 deletions tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,10 @@
<NoWarn>$(NoWarn);NU1510</NoWarn> <!-- NU1510: Project is explicitly referencing the runtime assembly 'System.Collections.Immutable', however, if we remove it, it tries to find it on the wrong path. Also, local NoWarn does not help - This is just me trying to enforce it -->
</PropertyGroup>
<ItemGroup>
<!-- NU1510: Project is explicitly referencing the runtime assembly 'System.Collections.Immutable', however, if we remove it, it tries to find it on the wrong path -->
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" GeneratePathProperty="true" NoWarn="NU1510" />
<!-- NU1510: Project is explicitly referencing the runtime assembly 'System.Collections.Immutable', however, if we remove it, it tries to find it on the wrong path .
TEST IF WE CAN ELIMINATE THIS DIRECT REFERENCE
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" GeneratePathProperty="true" ExcludeAssets="all" /> -->

<PackageReference Include="Microsoft.Net.Compilers" Version="$(MicrosoftNetCompilersVersion)" />
<PackageReference Include="Microsoft.DiaSymReader.PortablePdb" Version="$(MicrosoftDiaSymReaderPortablePdbVersion)">
<PrivateAssets>all</PrivateAssets>
Expand Down
36 changes: 29 additions & 7 deletions tests/FSharp.Test.Utilities/TestFramework.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ open System
open System.IO
open System.Diagnostics
open System.Reflection
open System.Xml.Linq
open Scripting
open Xunit
open FSharp.Compiler.IO
Expand Down Expand Up @@ -269,8 +270,31 @@ let requireFile dir path =
| Some _ -> fullPathLower
| None -> failwith (sprintf "Couldn't find \"%s\" on the following paths: \"%s\", \"%s\". Running 'build test' once might solve this issue" path fullPath fullPathLower)

let SCRIPT_ROOT = __SOURCE_DIRECTORY__
let repoRoot = SCRIPT_ROOT ++ ".." ++ ".."

let loadVersionsProps () =
let versionsPropsPath = repoRoot ++ "eng" ++ "Versions.props"
if not (File.Exists versionsPropsPath) then
failwithf "Versions.props file not found at %s" versionsPropsPath
XDocument.Load(versionsPropsPath)

let getMsbuildPropValue (xdoc: XDocument) (propName: string) =
xdoc.Descendants "PropertyGroup"
|> Seq.collect (fun pg -> pg.Elements())
|> Seq.tryFind (fun el -> el.Name.LocalName = propName)
|> function
| Some el -> el.Value
| None -> failwithf "Property '%s' not found in Versions.props" propName

// Usage example:
let versionsPropsDoc = loadVersionsProps ()
let cscVersion = getMsbuildPropValue versionsPropsDoc "MicrosoftNetCompilersVersion"
let ildasmVersion = getMsbuildPropValue versionsPropsDoc "MicrosoftNETCoreILDAsmVersion"
let ilasmVersion = getMsbuildPropValue versionsPropsDoc "MicrosoftNETCoreILAsmVersion"

let config configurationName envVars =
let SCRIPT_ROOT = __SOURCE_DIRECTORY__

let fsharpCoreArchitecture = "netstandard2.0"
let fsharpBuildArchitecture = "netstandard2.0"
let fsharpCompilerInteractiveSettingsArchitecture = "netstandard2.0"
Expand All @@ -284,10 +308,8 @@ let config configurationName envVars =
let fsiArchitecture = dotnetArchitecture
//let peverifyArchitecture = dotnetArchitecture
#endif
let repoRoot = SCRIPT_ROOT ++ ".." ++ ".."
let artifactsPath = repoRoot ++ "artifacts"
let artifactsBinPath = artifactsPath ++ "bin"
let coreClrRuntimePackageVersion = "5.0.0-preview.7.20364.11"
let csc_flags = "/nologo"
let vbc_flags = "/nologo"
let fsc_flags = "-r:System.Core.dll --nowarn:20 --define:COMPILED --preferreduilang:en-US"
Expand All @@ -298,12 +320,12 @@ let config configurationName envVars =
let packagesDir = getPackagesDir ()
let requirePackage = requireFile packagesDir
let requireArtifact = requireFile artifactsBinPath
let CSC = requirePackage ("Microsoft.Net.Compilers" ++ "4.3.0-1.22220.8" ++ "tools" ++ "csc.exe")
let VBC = requirePackage ("Microsoft.Net.Compilers" ++ "4.3.0-1.22220.8" ++ "tools" ++ "vbc.exe")
let CSC = requirePackage ("Microsoft.Net.Compilers" ++ cscVersion ++ "tools" ++ "csc.exe")
let VBC = requirePackage ("Microsoft.Net.Compilers" ++ cscVersion ++ "tools" ++ "vbc.exe")
let ILDASM_EXE = if operatingSystem = "win" then "ildasm.exe" else "ildasm"
let ILDASM = requirePackage (("runtime." + operatingSystem + "-" + architectureMoniker + ".Microsoft.NETCore.ILDAsm") ++ coreClrRuntimePackageVersion ++ "runtimes" ++ (operatingSystem + "-" + architectureMoniker) ++ "native" ++ ILDASM_EXE)
let ILDASM = requirePackage (("runtime." + operatingSystem + "-" + architectureMoniker + ".Microsoft.NETCore.ILDAsm") ++ ildasmVersion ++ "runtimes" ++ (operatingSystem + "-" + architectureMoniker) ++ "native" ++ ILDASM_EXE)
let ILASM_EXE = if operatingSystem = "win" then "ilasm.exe" else "ilasm"
let ILASM = requirePackage (("runtime." + operatingSystem + "-" + architectureMoniker + ".Microsoft.NETCore.ILAsm") ++ coreClrRuntimePackageVersion ++ "runtimes" ++ (operatingSystem + "-" + architectureMoniker) ++ "native" ++ ILASM_EXE)
let ILASM = requirePackage (("runtime." + operatingSystem + "-" + architectureMoniker + ".Microsoft.NETCore.ILAsm") ++ ilasmVersion ++ "runtimes" ++ (operatingSystem + "-" + architectureMoniker) ++ "native" ++ ILASM_EXE)
//let PEVERIFY_EXE = if operatingSystem = "win" then "PEVerify.exe" elif operatingSystem = "osx" then "PEVerify.dll" else "PEVerify"
let PEVERIFY = "ilverify" //requireArtifact ("PEVerify" ++ configurationName ++ peverifyArchitecture ++ PEVERIFY_EXE)
// let FSI_FOR_SCRIPTS = artifactsBinPath ++ "fsi" ++ configurationName ++ fsiArchitecture ++ "fsi.exe"
Expand Down
4 changes: 3 additions & 1 deletion vsintegration/Vsix/VisualFSharpFull/VisualFSharpDebug.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
<PackageTargetFallback>netcoreapp1.0</PackageTargetFallback>
<IsShipping>true</IsShipping>
<DependencyTargetFramework>net472</DependencyTargetFramework>
<DeployExtension>true</DeployExtension>
<DeployExtension>true</DeployExtension>
<UseSharedCompilation>false</UseSharedCompilation>
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
</PropertyGroup>

<Import Project="VisualFSharp.Core.targets" />
Expand Down
4 changes: 3 additions & 1 deletion vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
<IsShipping>true</IsShipping>
<DependencyTargetFramework>net472</DependencyTargetFramework>
<!-- locally you should deploy VisualFSharpDebug.vsix instead -->
<DeployExtension>false</DeployExtension>
<DeployExtension>false</DeployExtension>
<UseSharedCompilation>false</UseSharedCompilation>
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
</PropertyGroup>

<Import Project="VisualFSharp.Core.targets" />
Expand Down
Loading
Loading