Skip to content
This repository was archived by the owner on Oct 4, 2021. It is now read-only.

Commit 251bc47

Browse files
slluisslluis
authored
Merge pull request #9349 from mono/roslyn-msbuild-nuget
[Core] Add Microsoft.CodeAnalysis.Workspaces.MSBuild nuget
2 parents dddd6d4 + d4ca769 commit 251bc47

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

‎main/build/MacOSX/BinaryCompatBaseline.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ In VisualStudio.exe.config: couldn't find assembly 'System.Net.Http.Primitives'
55
Could not load the file 'Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'.
66
Could not load the file 'Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'.
77
Could not load the file 'Microsoft.Build.Utilities.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'.
8-
Could not load the file 'Microsoft.CodeAnalysis.Workspaces.MSBuild, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'.
98
Could not load the file 'Microsoft.Developer.IdentityService.Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'.
109
Could not load the file 'Microsoft.ServiceHub.Client, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'.
1110
Could not load the file 'Microsoft.TestPlatform.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'.
@@ -18,6 +17,8 @@ Could not load the file 'Xamarin.MacDev.Ide, Version=1.0.0.0, Culture=neutral, P
1817
In assembly 'Google.Apis.Core, Version=1.9.0.26010, Culture=neutral, PublicKeyToken=null': unable to resolve reference to 'System.Net.Http.Primitives, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
1918
In assembly 'Microsoft.CodeAnalysis.Scripting, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35': unable to resolve reference to 'System.Runtime.Loader, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
2019
In assembly 'Microsoft.CodeAnalysis.TypeScript.EditorFeatures, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': unable to resolve reference to 'Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
20+
In assembly 'Microsoft.CodeAnalysis.Workspaces.MSBuild, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35': unable to resolve reference to 'Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
21+
In assembly 'Microsoft.CodeAnalysis.Workspaces.MSBuild, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35': unable to resolve reference to 'Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
2122
In assembly 'Microsoft.VisualStudio.TestPlatform.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': unable to resolve reference to 'Microsoft.TestPlatform.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
2223
In assembly 'Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': Unable to resolve member reference 'System.Boolean System.Windows.FrameworkElement::get_UseLayoutRounding()' from assembly 'PresentationFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
2324
In assembly 'Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': Unable to resolve member reference 'System.Boolean System.Windows.UIElement::get_SnapsToDevicePixels()' from assembly 'PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
@@ -146,7 +147,6 @@ In assembly 'System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b
146147
In assembly 'System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': Unable to resolve type reference 'System.Net.ComNetOS' in 'System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089'
147148
In assembly 'System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': Unable to resolve type reference 'System.Net.UnsafeNclNativeMethods/NativePKI' in 'System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089'
148149
In assembly 'System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35': unable to resolve reference to 'System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
149-
In assembly 'VisualStudio.AndroidX.Migration, Version=1.0.7.0, Culture=neutral, PublicKeyToken=041cd80307429968': unable to resolve reference to 'Microsoft.CodeAnalysis.Workspaces.MSBuild, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
150150
In assembly 'Xamarin.AndroidDesigner.Mac, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756': unable to resolve reference to 'MonoTouch.Hosting, Version=0.0.0.0, Culture=neutral, PublicKeyToken=5caa9e03e69a5abd'
151151
In assembly 'Xamarin.AzureSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3ead7498f347467b': unable to resolve reference to 'Microsoft.Developer.IdentityService.Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
152152
In assembly 'Xamarin.AzureSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3ead7498f347467b': unable to resolve reference to 'Xamarin.Ide.Identity, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'

‎main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
-->
8888
<PackageReference Include="Microsoft.Build.Locator" Version="1.1.2" PrivateAssets="runtime" />
8989
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures" Version="$(NuGetVersionRoslyn)" PrivateAssets="runtime" />
90+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(NuGetVersionRoslyn)" PrivateAssets="runtime" />
9091
<PackageReference Include="Microsoft.VisualStudio.CodingConventions" Version="1.1.20180503.2" PrivateAssets="runtime" />
9192
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(NuGetVersionVSComposition)" ExcludeAssets="all" />
9293
<!-- Need the net45 version, see https://github.com/mono/mono/issues/12461 -->
@@ -131,6 +132,7 @@
131132
<IncludeCopyLocal Include="Microsoft.CodeAnalysis.VisualBasic.Features.dll" />
132133
<IncludeCopyLocal Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll" />
133134
<IncludeCopyLocal Include="Microsoft.CodeAnalysis.Workspaces.dll" />
135+
<IncludeCopyLocal Include="Microsoft.CodeAnalysis.Workspaces.MSBuild.dll" />
134136
<IncludeCopyLocal Include="Microsoft.DiaSymReader.dll" />
135137
<IncludeCopyLocal Include="Microsoft.Extensions.ObjectPool.dll" />
136138
<IncludeCopyLocal Include="Microsoft.VisualStudio.CodingConventions.dll" />

‎main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@
430430
<Assembly file="Microsoft.CodeAnalysis.VisualBasic.Features.dll" />
431431
<Assembly file="Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll" />
432432
<Assembly file="Microsoft.CodeAnalysis.Workspaces.dll" />
433+
<Assembly file="Microsoft.CodeAnalysis.Workspaces.MSBuild.dll" />
433434
<Assembly file="Microsoft.VisualStudio.CodingConventions.dll" />
434435
<Assembly file="Microsoft.VisualStudio.Language.dll" />
435436
<Assembly file="Microsoft.VisualStudio.Language.StandardClassification.dll"/>

‎main/src/core/MonoDevelop.Startup/app.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<dependentAssembly><assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-3.4.0.0" newVersion="3.4.0.0" /></dependentAssembly>
1919
<dependentAssembly><assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-3.4.0.0" newVersion="3.4.0.0" /></dependentAssembly>
2020
<dependentAssembly><assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-3.4.0.0" newVersion="3.4.0.0" /></dependentAssembly>
21+
<dependentAssembly><assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces.MSBuild" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-3.4.0.0" newVersion="3.4.0.0" /></dependentAssembly>
2122
<dependentAssembly><assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-3.4.0.0" newVersion="3.4.0.0" /></dependentAssembly>
2223
<dependentAssembly><assemblyIdentity name="Microsoft.Diagnostics.Tracing.EventSource" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-1.1.28.0" newVersion="1.1.28.0" /></dependentAssembly>
2324
<dependentAssembly><assemblyIdentity name="Microsoft.VisualStudio.CoreUtility" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /><bindingRedirect oldVersion="0.0.0.0-16.0.0.0" newVersion="16.0.0.0" /></dependentAssembly>

0 commit comments

Comments
 (0)