Bumping submodules (mono#301)

* Bump xamarin/debugger-libs@6e097ce * Adding explicit references to CodeAnalysis packages Co-authored-by: Luke Westendorf <lukewest@microsoft.com>
mauroa · Nov 8, 2022 · d15e47f · d15e47f
1 parent a089e5a
commit d15e47f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/external/debugger-libs b/external/debugger-libs
diff --git a/src/Debugging.VisualStudio.Vsix/Debugging.VisualStudio.Vsix.csproj b/src/Debugging.VisualStudio.Vsix/Debugging.VisualStudio.Vsix.csproj
@@ -23,11 +23,14 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="GitInfo" Version="2.2.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(NuGetVersionRoslyn)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(NuGetVersionRoslyn)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(NuGetVersionRoslyn)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(NuGetVersionRoslyn)" />
     <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.3.0-preview-3-32607-145" />
 		<PackageReference Include="Microsoft.VisualStudio.Interop" Version="17.3.0-preview-3-32607-106" />
     <PackageReference Include="Microsoft.VisualStudio.SDK.VsixSuppression" Version="14.1.37" />
     <PackageReference Include="Microsoft.VisualStudio.Debugger.Contracts" Version="17.4.0-beta.22368.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.1.0" />
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.9.1050">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/Debugging.VisualStudio/Debugging.VisualStudio.csproj b/src/Debugging.VisualStudio/Debugging.VisualStudio.csproj
@@ -25,8 +25,9 @@
   <ItemGroup>
     <PackageReference Include="GitInfo" Version="2.2.0" />
     <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.3.0-preview-3-32607-145" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.1.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(NuGetVersionRoslyn)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(NuGetVersionRoslyn)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(NuGetVersionRoslyn)" />
     <PackageReference Include="Microsoft.VisualStudio.Interop" Version="17.3.0-preview-3-32607-106" />
     <PackageReference Include="Microsoft.VisualStudio.ProjectSystem" Version="17.3.346-pre" />
     <PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Managed" Version="17.3.32-gd8b2cf4a2d" />
@@ -89,7 +90,7 @@
     <NuGetFilesToSign Include="..\packages\system.diagnostics.tracer\**\lib\net45\System.Diagnostics.Tracer.dll">
       <Authenticode>Microsoft400</Authenticode>
     </NuGetFilesToSign>
-	</ItemGroup>
+  </ItemGroup>
   <ItemGroup>
     <None Include="Debugging.VisualStudio.targets" />
   </ItemGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -33,6 +33,10 @@
 		<Compile Include="$(MSBuildThisFileDirectory)GlobalAssemblyInfo.cs" />
 	</ItemGroup>
 
+	<PropertyGroup>
+		<NuGetVersionRoslyn Condition="$(NuGetVersionRoslyn) == ''">4.5.0-1.22517.2</NuGetVersionRoslyn>
+	</PropertyGroup>
+
 	<!-- CI properties for VSTS -->
 	<PropertyGroup>
 		<CI Condition="'$(CI)' == '' and '$(TF_BUILD)' == 'true'">true</CI>
+1 −1		Mono.Debugging.Soft/Mono.Debugging.Soft.csproj
+4 −6		Mono.Debugging/Mono.Debugging.Client/BreakpointStore.cs
+50 −609		Mono.Debugging/Mono.Debugging.Evaluation/LambdaBodyOutputVisitor.cs
+13 −14		Mono.Debugging/Mono.Debugging.Evaluation/NRefactoryExpressionEvaluator.cs
+364 −823		Mono.Debugging/Mono.Debugging.Evaluation/NRefactoryExpressionEvaluatorVisitor.cs
+34 −40		Mono.Debugging/Mono.Debugging.Evaluation/NRefactoryExpressionResolverVisitor.cs
+97 −67		Mono.Debugging/Mono.Debugging.Evaluation/NRefactoryExtensions.cs
+8 −6		Mono.Debugging/Mono.Debugging.csproj