diff --git a/Build/NuGet.csproj b/Build/NuGet.csproj
index e5c6bbdc..e3229738 100644
--- a/Build/NuGet.csproj
+++ b/Build/NuGet.csproj
@@ -7,26 +7,22 @@
     <None Remove="*.*" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BlackFox.CommandLine" version="1.0.0" />
-    <PackageReference Include="NuGet.CommandLine" version="6.3.1">
+    <PackageReference Include="BlackFox.CommandLine" />
+    <PackageReference Include="NuGet.CommandLine">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" version="3.1.2">
+    <PackageReference Include="coverlet.collector">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mono.Options" version="6.12.0.148" />
-    <PackageReference Include="coveralls.io" version="1.4.2" />
-    <!-- This one w/just net20/net40 agents works as before on Linux for the AltCoverRunner test -->
-    <PackageReference Include="NUnit.ConsoleRunner" Condition="'$(OS)' != 'Windows_NT'" version="3.12.0" />
-    <!-- This one w/extra netcore3.1 agent causes mono vs framework problems for some reason on the AltCoverRunner test -->
-    <PackageReference Include="NUnit.ConsoleRunner" Condition="'$(OS)' == 'Windows_NT'" version="3.15.2" />
-    <PackageReference Include="OpenCover" version="4.7.1221" />
-    <PackageReference Include="xunit.runner.console" version="2.4.2" />
-    <PackageReference Include="Pester" version="5.3.3" />
-    <PackageReference Include="AltCode.Dixon" version="2022.1.8.13182" />
-    <PackageReference Include="altcode.gendarme" version="2022.5.17.8260" />
-    <PackageReference Include="XmlDoc2CmdletDoc" version="0.4.0-dotnetcore0001" />
+    <PackageReference Include="Mono.Options" />
+    <PackageReference Include="NUnit.ConsoleRunner" />
+    <PackageReference Include="OpenCover" />
+    <PackageReference Include="xunit.runner.console" />
+    <PackageReference Include="Pester" />
+    <PackageReference Include="AltCode.Dixon" />
+    <PackageReference Include="altcode.gendarme" />
+    <PackageReference Include="XmlDoc2CmdletDoc" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 13cad125..14481088 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,5 +1,23 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All" />
+    <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />
+    <PackageVersion Include="Mono.Cecil" Version="0.11.4" />
+    <PackageVersion Include="Mono.CSharp" Version="4.0.0.143" />
+    <!-- PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" / -->
+    <PackageVersion Include="FSharp.Core" Version="6.0.6" />
+    <PackageVersion Include="BlackFox.CommandLine" version="1.0.0" />
+    <PackageVersion Include="NuGet.CommandLine" version="6.3.1" />
+    <PackageVersion Include="coverlet.collector" version="3.1.2" />
+    <PackageVersion Include="Mono.Options" version="6.12.0.148" />
+    <!-- This one w/just net20/net40 agents works as before on Linux for the AltCoverRunner test -->
+    <PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' != 'Windows_NT'" version="3.12.0" />
+    <!-- This one w/extra netcore3.1 agent causes mono vs framework problems for some reason on the AltCoverRunner test -->
+    <PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' == 'Windows_NT'" version="3.15.2" />
+    <PackageVersion Include="OpenCover" version="4.7.1221" />
+    <PackageVersion Include="xunit.runner.console" version="2.4.2" />
+    <PackageVersion Include="Pester" version="5.3.3" />
+    <PackageVersion Include="AltCode.Dixon" version="2022.1.8.13182" />
+    <PackageVersion Include="altcode.gendarme" version="2022.5.17.8260" />
+    <PackageVersion Include="XmlDoc2CmdletDoc" version="0.4.0-dotnetcore0001" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/MCS.sln b/MCS.sln
index 57935269..5fa4033e 100644
--- a/MCS.sln
+++ b/MCS.sln
@@ -1,11 +1,19 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29728.190
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "MCS", "MCS\MCS.fsproj", "{FBAA818A-A049-4149-9032-31C8D244AEA6}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "MCS", "MCS\MCS.fsproj", "{FBAA818A-A049-4149-9032-31C8D244AEA6}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Sample4LongForm", "Samples\Sample4\Sample4LongForm.fsproj", "{607161F1-86BE-471A-9837-3D19BFAAA5FA}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Sample4LongForm", "Samples\Sample4\Sample4LongForm.fsproj", "{607161F1-86BE-471A-9837-3D19BFAAA5FA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{121FB9B3-C225-4FF9-AD1D-F4AE9537BACF}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Packages.props = Directory.Packages.props
+		NuGet.config = NuGet.config
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet", "Build\NuGet.csproj", "{C79CBF0D-3272-4DAE-A33B-D0A6546F7131}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,10 +29,15 @@ Global
 		{607161F1-86BE-471A-9837-3D19BFAAA5FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{607161F1-86BE-471A-9837-3D19BFAAA5FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{607161F1-86BE-471A-9837-3D19BFAAA5FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C79CBF0D-3272-4DAE-A33B-D0A6546F7131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C79CBF0D-3272-4DAE-A33B-D0A6546F7131}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{C79CBF0D-3272-4DAE-A33B-D0A6546F7131} = {121FB9B3-C225-4FF9-AD1D-F4AE9537BACF}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F8935BED-9DF1-47CF-9A24-00B6C1250E99}
 	EndGlobalSection
diff --git a/MCS/MCS.fsproj b/MCS/MCS.fsproj
index 9a801e7c..71fd8d85 100644
--- a/MCS/MCS.fsproj
+++ b/MCS/MCS.fsproj
@@ -23,13 +23,9 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Mono.Cecil" Version="0.11.4" />
-    <PackageReference Include="Mono.CSharp" Version="4.0.0.143" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="FSharp.Core" Version="6.0.6" />
+    <PackageReference Include="Mono.Cecil" />
+    <PackageReference Include="Mono.CSharp" />
+    <PackageReference Include="FSharp.Core" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/NuGet.config b/NuGet.config
index 18aee5e9..c79e7f8c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -3,4 +3,10 @@
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
+  <packageSourceMapping>
+  <!-- key value for <packageSource> should match key values from <packageSources> element -->
+  <packageSource key="nuget.org">
+    <package pattern="*" />
+  </packageSource>
+</packageSourceMapping>
 </configuration>
\ No newline at end of file