Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
d168bc5
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Oct 22, 2025
e858730
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Oct 24, 2025
3417aba
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Oct 25, 2025
4ab7ed0
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Oct 28, 2025
f4f2529
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Oct 29, 2025
6402b2d
Merge branch 'main' into darc-main-d37c64d2-254e-47a7-9911-2f2279030766
T-Gro Nov 3, 2025
8d20434
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 5, 2025
f1ca843
Bump dependency versions in Version.Details.props
T-Gro Nov 6, 2025
8dcee45
Merge branch 'main' into darc-main-d37c64d2-254e-47a7-9911-2f2279030766
T-Gro Nov 6, 2025
87e7b6f
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 8, 2025
ac21c9e
Merge branch 'main' into darc-main-d37c64d2-254e-47a7-9911-2f2279030766
T-Gro Nov 10, 2025
cfb1626
Merge branch 'main' into darc-main-d37c64d2-254e-47a7-9911-2f2279030766
T-Gro Nov 10, 2025
0ae591f
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 11, 2025
1ed5e97
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 13, 2025
e9aead0
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 14, 2025
9d94b39
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 18, 2025
6075685
align system versions with msbuild (towards 9.0.9)
T-Gro Nov 18, 2025
7a57a7c
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 19, 2025
2449a0c
simplify deps
T-Gro Nov 19, 2025
b39b279
Merge branch 'darc-main-d37c64d2-254e-47a7-9911-2f2279030766' of http…
T-Gro Nov 19, 2025
59aaaa5
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 20, 2025
c95b2ed
Merge branch 'main' into darc-main-d37c64d2-254e-47a7-9911-2f2279030766
T-Gro Nov 20, 2025
cec8b45
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 21, 2025
1095a2f
Update global.json
T-Gro Nov 21, 2025
d1b35f3
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 22, 2025
6feb228
Fix net472 ass resolve recursion (ours clashing with test frameworks)
T-Gro Nov 24, 2025
c213af9
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 25, 2025
5ddcad9
sln updates
T-Gro Nov 25, 2025
c1c30d9
Merge branch 'darc-main-d37c64d2-254e-47a7-9911-2f2279030766' of http…
T-Gro Nov 25, 2025
288da9e
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 26, 2025
5e03366
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 27, 2025
b5c972a
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 28, 2025
77379ff
Merge branch 'main' into darc-main-d37c64d2-254e-47a7-9911-2f2279030766
T-Gro Dec 12, 2025
43d078e
Merge branch 'main' into darc-main-d37c64d2-254e-47a7-9911-2f2279030766
T-Gro Jan 9, 2026
08bd486
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Jan 21, 2026
20d7aea
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Jan 22, 2026
a9e7328
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Jan 23, 2026
63030c3
Merge branch 'main' into darc-main-d37c64d2-254e-47a7-9911-2f2279030766
T-Gro Jan 23, 2026
f9b2644
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Jan 24, 2026
aaab0d5
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Jan 27, 2026
b937321
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Jan 29, 2026
7499df5
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Jan 30, 2026
ad95f2e
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Jan 31, 2026
a434f67
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 3, 2026
30904b8
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 4, 2026
6e5b5dc
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 5, 2026
7ed02d2
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 6, 2026
07e4092
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 7, 2026
3c83b75
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 10, 2026
82ed53c
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 12, 2026
767c56a
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 13, 2026
5b17fc0
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 14, 2026
248c483
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 16, 2026
17aacb5
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 17, 2026
636aa40
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 19, 2026
ada3c6b
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 20, 2026
d303967
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 21, 2026
3ab9e13
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 25, 2026
315d9e9
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 26, 2026
a9bd45f
Merge branch 'main' into darc-main-d37c64d2-254e-47a7-9911-2f2279030766
T-Gro Feb 26, 2026
e616afe
Update Versions.props
T-Gro Feb 26, 2026
f9e35f8
Merge branch 'main' into darc-main-d37c64d2-254e-47a7-9911-2f2279030766
T-Gro Feb 26, 2026
02f0581
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 27, 2026
7432bfb
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Feb 28, 2026
eae54e1
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Mar 1, 2026
6c35fbd
Update MSBuild, Roslyn, and System.* dependencies
T-Gro Mar 2, 2026
ab45cca
Merge branch 'main' into darc-main-d37c64d2-254e-47a7-9911-2f2279030766
T-Gro Mar 2, 2026
dbec6a8
Try remove MicrosoftCompositionVersion
T-Gro Mar 2, 2026
e30ffb7
Merge branch 'darc-main-d37c64d2-254e-47a7-9911-2f2279030766' of http…
T-Gro Mar 2, 2026
636912d
remove SystemCompositionVersion alltogether
T-Gro Mar 2, 2026
5863a72
Update dependencies from https://github.com/dotnet/msbuild build 2026…
dotnet-maestro[bot] Mar 3, 2026
ca6784f
add system composition
T-Gro Mar 3, 2026
ebbfd2a
Merge branch 'darc-main-d37c64d2-254e-47a7-9911-2f2279030766' of http…
T-Gro Mar 3, 2026
e6428f4
add SystemCollectionsImmutableVersion
T-Gro Mar 3, 2026
f2891e1
Revert "add SystemCollectionsImmutableVersion"
T-Gro Mar 3, 2026
cc99626
Update FSharp.Test.Utilities.fsproj
T-Gro Mar 3, 2026
3bd0c53
Update Versions.props
T-Gro Mar 3, 2026
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
8 changes: 6 additions & 2 deletions VisualFSharp.sln
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.1.32113.165
# Visual Studio Version 18
VisualStudioVersion = 18.3.11210.18 main
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualFSharp.UnitTests Support", "VisualFSharp.UnitTests Support", "{3F044931-FB83-4433-B934-AE66AB27B278}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualFSharp", "VisualFSharp", "{4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}"
ProjectSection(SolutionItems) = preProject
vsintegration\Directory.Build.props = vsintegration\Directory.Build.props
vsintegration\Directory.Build.targets = vsintegration\Directory.Build.targets
vsintegration\readme.md = vsintegration\readme.md
vsintegration\Templates.Directory.Build.props = vsintegration\Templates.Directory.Build.props
vsintegration\Templates.Directory.Build.targets = vsintegration\Templates.Directory.Build.targets
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
Expand Down
38 changes: 12 additions & 26 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,19 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/msbuild dependencies -->
<MicrosoftBuildPackageVersion>18.1.0-preview-25515-01</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>18.1.0-preview-25515-01</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildTasksCorePackageVersion>18.1.0-preview-25515-01</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25515-01</MicrosoftBuildUtilitiesCorePackageVersion>
<!-- dotnet/runtime dependencies -->
<SystemCollectionsImmutablePackageVersion>9.0.0</SystemCollectionsImmutablePackageVersion>
<SystemComponentModelCompositionPackageVersion>9.0.0</SystemComponentModelCompositionPackageVersion>
<SystemCompositionPackageVersion>9.0.0</SystemCompositionPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>9.0.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemReflectionMetadataPackageVersion>9.0.0</SystemReflectionMetadataPackageVersion>
<SystemThreadingTasksDataflowPackageVersion>9.0.0</SystemThreadingTasksDataflowPackageVersion>
<MicrosoftBuildPackageVersion>18.6.0-preview-26152-06</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>18.6.0-preview-26152-06</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildTasksCorePackageVersion>18.6.0-preview-26152-06</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>18.6.0-preview-26152-06</MicrosoftBuildUtilitiesCorePackageVersion>
<!-- dotnet/roslyn dependencies -->
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCompilersPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisCompilersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisFeaturesPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-2.25480.7</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>5.6.0-2.26151.2</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCompilersPackageVersion>5.6.0-2.26151.2</MicrosoftCodeAnalysisCompilersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.6.0-2.26151.2</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.6.0-2.26151.2</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.6.0-2.26151.2</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.6.0-2.26151.2</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.6.0-2.26151.2</MicrosoftCodeAnalysisFeaturesPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.6.0-2.26151.2</MicrosoftVisualStudioLanguageServicesPackageVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26123.2</MicrosoftDotNetArcadeSdkPackageVersion>
<!-- _git/dotnet-optimization dependencies -->
Expand All @@ -42,13 +35,6 @@ This file should be imported by eng/Versions.props
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildUtilitiesCorePackageVersion)</MicrosoftBuildUtilitiesCoreVersion>
<!-- dotnet/runtime dependencies -->
<SystemCollectionsImmutableVersion>$(SystemCollectionsImmutablePackageVersion)</SystemCollectionsImmutableVersion>
<SystemComponentModelCompositionVersion>$(SystemComponentModelCompositionPackageVersion)</SystemComponentModelCompositionVersion>
<SystemCompositionVersion>$(SystemCompositionPackageVersion)</SystemCompositionVersion>
<SystemDiagnosticsDiagnosticSourceVersion>$(SystemDiagnosticsDiagnosticSourcePackageVersion)</SystemDiagnosticsDiagnosticSourceVersion>
<SystemReflectionMetadataVersion>$(SystemReflectionMetadataPackageVersion)</SystemReflectionMetadataVersion>
<SystemThreadingTasksDataflowVersion>$(SystemThreadingTasksDataflowPackageVersion)</SystemThreadingTasksDataflowVersion>
<!-- dotnet/roslyn dependencies -->
<MicrosoftCodeAnalysisVersion>$(MicrosoftCodeAnalysisPackageVersion)</MicrosoftCodeAnalysisVersion>
<MicrosoftCodeAnalysisCompilersVersion>$(MicrosoftCodeAnalysisCompilersPackageVersion)</MicrosoftCodeAnalysisCompilersVersion>
Expand Down
72 changes: 24 additions & 48 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,77 +2,53 @@
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="51587e2f3d5f86ca27184a6b5e8a778841d05b31" BarId="302820" />
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25515-01">
<Dependency Name="Microsoft.Build" Version="18.6.0-preview-26152-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>5e273ccd45ba73d9db9b34fceaf9a110412e64e8</Sha>
<Sha>98231a0f9d8ee91c0a974d20375d17708958a598</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="18.1.0-preview-25515-01">
<Dependency Name="Microsoft.Build.Framework" Version="18.6.0-preview-26152-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>5e273ccd45ba73d9db9b34fceaf9a110412e64e8</Sha>
<Sha>98231a0f9d8ee91c0a974d20375d17708958a598</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.1.0-preview-25515-01">
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.6.0-preview-26152-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>5e273ccd45ba73d9db9b34fceaf9a110412e64e8</Sha>
<Sha>98231a0f9d8ee91c0a974d20375d17708958a598</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25515-01">
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.6.0-preview-26152-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>5e273ccd45ba73d9db9b34fceaf9a110412e64e8</Sha>
<Sha>98231a0f9d8ee91c0a974d20375d17708958a598</Sha>
</Dependency>
<Dependency Name="System.Reflection.Metadata" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.Composition" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Composition" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Collections.Immutable" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Threading.Tasks.Dataflow" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25480.7">
<Dependency Name="Microsoft.CodeAnalysis" Version="5.6.0-2.26151.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
<Sha>6bdca1d6466c2f9ef46f8e5d3422fbe3568d503c</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.0.0-2.25480.7">
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.6.0-2.26151.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
<Sha>6bdca1d6466c2f9ef46f8e5d3422fbe3568d503c</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-2.25480.7">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.6.0-2.26151.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
<Sha>6bdca1d6466c2f9ef46f8e5d3422fbe3568d503c</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-2.25480.7">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.6.0-2.26151.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
<Sha>6bdca1d6466c2f9ef46f8e5d3422fbe3568d503c</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-2.25480.7">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.6.0-2.26151.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
<Sha>6bdca1d6466c2f9ef46f8e5d3422fbe3568d503c</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25480.7">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.6.0-2.26151.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
<Sha>6bdca1d6466c2f9ef46f8e5d3422fbe3568d503c</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.0.0-2.25480.7">
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.6.0-2.26151.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
<Sha>6bdca1d6466c2f9ef46f8e5d3422fbe3568d503c</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-2.25480.7">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.6.0-2.26151.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
<Sha>6bdca1d6466c2f9ef46f8e5d3422fbe3568d503c</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
21 changes: 10 additions & 11 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,17 @@
<!-- PR builds should explicitly specify a version number -->
</PropertyGroup>

<!-- Dependencies from maintenance-packages, source-build specific -->
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">

<PropertyGroup>
<SystemBuffersVersion>4.6.1</SystemBuffersVersion>
<SystemMemoryVersion>4.6.3</SystemMemoryVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.2</SystemRuntimeCompilerServicesUnsafeVersion>
</PropertyGroup>
<!-- Dependencies from maintenance-packages, everything else -->
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<SystemBuffersVersion>4.6.0</SystemBuffersVersion>
<SystemMemoryVersion>4.6.0</SystemMemoryVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
<!-- System.* packages from dotnet/runtime, aligned with MSBuild and Roslyn deps. -->
<SystemPackagesVersion>10.0.2</SystemPackagesVersion>
<SystemCollectionsImmutableVersion>$(SystemPackagesVersion)</SystemCollectionsImmutableVersion>
<SystemCompositionVersion>$(SystemPackagesVersion)</SystemCompositionVersion>
<SystemDiagnosticsDiagnosticSourceVersion>$(SystemPackagesVersion)</SystemDiagnosticsDiagnosticSourceVersion>
<SystemReflectionMetadataVersion>$(SystemPackagesVersion)</SystemReflectionMetadataVersion>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -104,8 +104,8 @@
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
<!-- Versions for package groups -->
<VisualStudioEditorPackagesVersion>18.0.332-preview</VisualStudioEditorPackagesVersion>
<MicrosoftVisualStudioShellPackagesVersion>18.0.2101-preview.1</MicrosoftVisualStudioShellPackagesVersion>
<VisualStudioEditorPackagesVersion>18.0.404-preview</VisualStudioEditorPackagesVersion>
<MicrosoftVisualStudioShellPackagesVersion>18.0.2188-preview.1</MicrosoftVisualStudioShellPackagesVersion>
<VisualStudioProjectSystemPackagesVersion>18.0.1237-pre</VisualStudioProjectSystemPackagesVersion>
<VisualStudioShellProjectsPackages>18.0.2077-preview.1</VisualStudioShellProjectsPackages>
<MicrosoftVisualStudioThreadingPackagesVersion>18.0.5</MicrosoftVisualStudioThreadingPackagesVersion>
Expand Down Expand Up @@ -160,7 +160,6 @@
<!-- other packages -->
<BenchmarkDotNetVersion>0.13.10</BenchmarkDotNetVersion>
<FsCheckVersion>2.16.6</FsCheckVersion>
<MicrosoftCompositionVersion>1.0.31</MicrosoftCompositionVersion>
<MicrosoftNetCompilersVersion>4.3.0-1.22220.8</MicrosoftNetCompilersVersion>
<!-- 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>
Expand Down
2 changes: 0 additions & 2 deletions src/fsc/fsc.targets
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
</ItemGroup>

</Project>
57 changes: 36 additions & 21 deletions tests/FSharp.Test.Utilities/CompilerAssert.fs
Original file line number Diff line number Diff line change
Expand Up @@ -32,34 +32,49 @@ open System.Collections.Immutable
#if !NETCOREAPP
module AssemblyResolver =

open System.Collections.Generic

let probingPaths = [|
AppDomain.CurrentDomain.BaseDirectory
Path.GetDirectoryName(typeof<FactForDESKTOPAttribute>.Assembly.Location)
|]

// Add a static HashSet to track currently resolving assemblies
let private resolvingAssemblies = HashSet<string>()

let addResolver () =
AppDomain.CurrentDomain.add_AssemblyResolve(fun h args ->
let found () =
(probingPaths ) |> Seq.tryPick(fun p ->
try
let name = AssemblyName(args.Name)
let codebase = Path.GetFullPath(Path.Combine(p, name.Name))
if File.Exists(codebase + ".dll") then
name.CodeBase <- codebase + ".dll"
name.CultureInfo <- Unchecked.defaultof<CultureInfo>
name.Version <- Unchecked.defaultof<Version>
Some (name)
elif File.Exists(codebase + ".exe") then
name.CodeBase <- codebase + ".exe"
name.CultureInfo <- Unchecked.defaultof<CultureInfo>
name.Version <- Unchecked.defaultof<Version>
Some (name)
else None
with | _ -> None
)
match found() with
| None -> Unchecked.defaultof<Assembly>
| Some name -> Assembly.Load(name) )
let assemblyName = args.Name
// Prevent recursion: skip if already resolving this assembly
if resolvingAssemblies.Contains(assemblyName) then
null
else
try
resolvingAssemblies.Add(assemblyName) |> ignore
let found () =
(probingPaths ) |> Seq.tryPick(fun p ->
try
let name = AssemblyName(args.Name)
let codebase = Path.GetFullPath(Path.Combine(p, name.Name))
if File.Exists(codebase + ".dll") then
name.CodeBase <- codebase + ".dll"
name.CultureInfo <- Unchecked.defaultof<CultureInfo>
name.Version <- Unchecked.defaultof<Version>
Some (name)
elif File.Exists(codebase + ".exe") then
name.CodeBase <- codebase + ".exe"
name.CultureInfo <- Unchecked.defaultof<CultureInfo>
name.Version <- Unchecked.defaultof<Version>
Some (name)
else None
with | _ -> None
)
match found() with
| None -> null
| Some name -> Assembly.Load(name)
finally
resolvingAssemblies.Remove(assemblyName) |> ignore
)
#endif

type ExecutionOutcome =
Expand Down
4 changes: 1 addition & 3 deletions tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="$(PkgSystem_Collections_Immutable)\lib\netstandard2.0\System.Collections.Immutable.dll" LogicalName="netstandard2.0.System.Collections.Immutable.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgSystem_Collections_Immutable)\lib\netstandard2.0\System.Collections.Immutable.dll" LogicalName="netstandard2.0.System.Collections.Immutable.dll" />
</ItemGroup>
</Project>
Loading
Loading