diff options
Diffstat (limited to 'main')
-rw-r--r-- | main/Directory.Build.props | 2 | ||||
-rwxr-xr-x | main/build/MacOSX/BinaryCompatBaseline.txt | 14 | ||||
-rw-r--r-- | main/src/core/MonoDevelop.Startup/app.config | 28 |
3 files changed, 22 insertions, 22 deletions
diff --git a/main/Directory.Build.props b/main/Directory.Build.props index 7f3b96a752..dcf4897bf3 100644 --- a/main/Directory.Build.props +++ b/main/Directory.Build.props @@ -17,7 +17,7 @@ <NuGetVersionMicrosoftTestPlatform>16.2.0</NuGetVersionMicrosoftTestPlatform> <NuGetVersionMonoDevelopAnalyzers>0.1.0.2</NuGetVersionMonoDevelopAnalyzers> <NuGetVersionNewtonsoftJson>12.0.2</NuGetVersionNewtonsoftJson> - <NuGetVersionNuGet>5.3.0-rtm.6192</NuGetVersionNuGet> + <NuGetVersionNuGet>5.4.0</NuGetVersionNuGet> <NuGetVersionNUnit2>2.7.0</NuGetVersionNUnit2> <NuGetVersionNUnit3>3.9.0</NuGetVersionNUnit3> <NuGetVersionVSCodeDebugProtocol>15.8.20719.1</NuGetVersionVSCodeDebugProtocol> diff --git a/main/build/MacOSX/BinaryCompatBaseline.txt b/main/build/MacOSX/BinaryCompatBaseline.txt index 5cbbb63193..70dfcec3c1 100755 --- a/main/build/MacOSX/BinaryCompatBaseline.txt +++ b/main/build/MacOSX/BinaryCompatBaseline.txt @@ -126,13 +126,13 @@ In assembly 'MonoDevelop.MSBuildBuilder, Version=1.0.0.0, Culture=neutral, Publi In assembly 'MonoDevelop.MSBuildBuilder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3ead7498f347467b': unable to resolve reference to 'Microsoft.Build.Utilities.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' In assembly 'MonoDevelop.MSBuildResolver, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3ead7498f347467b': unable to resolve reference to 'Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' In assembly 'MonoTouch.Design.Client.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' -In assembly 'NuGet.Protocol, Version=5.3.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve member reference 'System.IdentityModel.Tokens.SecurityToken System.ServiceModel.Security.IWSTrustChannelContract::Issue(System.IdentityModel.Protocols.WSTrust.RequestSecurityToken)' from assembly 'System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' -In assembly 'NuGet.Protocol, Version=5.3.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve member reference 'System.Void System.IdentityModel.Protocols.WSTrust.RequestSecurityToken::.ctor()' from assembly 'System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' -In assembly 'NuGet.Protocol, Version=5.3.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve member reference 'System.Void System.ServiceModel.Security.WSTrustChannelFactory::.ctor(System.ServiceModel.Channels.Binding,System.String)' from assembly 'System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' -In assembly 'NuGet.Protocol, Version=5.3.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve member reference 'System.Void System.ServiceModel.Security.WSTrustChannelFactory::set_TrustVersion(System.ServiceModel.Security.TrustVersion)' from assembly 'System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' -In assembly 'NuGet.Protocol, Version=5.3.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve type reference 'System.IdentityModel.Protocols.WSTrust.RequestSecurityToken' in 'System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' -In assembly 'NuGet.Protocol, Version=5.3.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve type reference 'System.ServiceModel.Security.IWSTrustChannelContract' in 'System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' -In assembly 'NuGet.Protocol, Version=5.3.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve type reference 'System.ServiceModel.Security.WSTrustChannelFactory' in 'System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' +In assembly 'NuGet.Protocol, Version=5.4.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve member reference 'System.IdentityModel.Tokens.SecurityToken System.ServiceModel.Security.IWSTrustChannelContract::Issue(System.IdentityModel.Protocols.WSTrust.RequestSecurityToken)' from assembly 'System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' +In assembly 'NuGet.Protocol, Version=5.4.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve member reference 'System.Void System.IdentityModel.Protocols.WSTrust.RequestSecurityToken::.ctor()' from assembly 'System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' +In assembly 'NuGet.Protocol, Version=5.4.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve member reference 'System.Void System.ServiceModel.Security.WSTrustChannelFactory::.ctor(System.ServiceModel.Channels.Binding,System.String)' from assembly 'System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' +In assembly 'NuGet.Protocol, Version=5.4.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve member reference 'System.Void System.ServiceModel.Security.WSTrustChannelFactory::set_TrustVersion(System.ServiceModel.Security.TrustVersion)' from assembly 'System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' +In assembly 'NuGet.Protocol, Version=5.4.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve type reference 'System.IdentityModel.Protocols.WSTrust.RequestSecurityToken' in 'System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' +In assembly 'NuGet.Protocol, Version=5.4.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve type reference 'System.ServiceModel.Security.IWSTrustChannelContract' in 'System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' +In assembly 'NuGet.Protocol, Version=5.4.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35': Unable to resolve type reference 'System.ServiceModel.Security.WSTrustChannelFactory' in 'System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' In assembly 'nunit.engine, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb': Unable to resolve member reference 'Mono.Collections.Generic.Collection`1<Mono.Cecil.TypeReference> Mono.Cecil.TypeDefinition::get_Interfaces()' from assembly 'Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756' In assembly 'System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': Unable to resolve member reference 'System.Boolean System.Net.ComNetOS::IsWin7orLater' from assembly 'System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' In assembly 'System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': Unable to resolve member reference 'System.Diagnostics.TraceSource System.Net.Logging::get_Http()' from assembly 'System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' diff --git a/main/src/core/MonoDevelop.Startup/app.config b/main/src/core/MonoDevelop.Startup/app.config index ac6d9c0ea6..31a7a20181 100644 --- a/main/src/core/MonoDevelop.Startup/app.config +++ b/main/src/core/MonoDevelop.Startup/app.config @@ -36,20 +36,20 @@ <dependentAssembly><assemblyIdentity name="Mono.Cecil" culture="neutral" publicKeyToken="50cebf1cceb9d05e" /><bindingRedirect oldVersion="0.0.0.0-0.10.1.0" newVersion="0.10.1.0" /></dependentAssembly> <dependentAssembly><assemblyIdentity name="mscorlib" culture="neutral" publicKeyToken="b77a5c561934e089" /><bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /></dependentAssembly> <dependentAssembly><assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.Commands" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.Common" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.Configuration" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.Credentials" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.DependencyResolver.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.Frameworks" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.Indexing" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.LibraryModel" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.PackageManagement" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.Packaging" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.ProjectModel" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.Protocol" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.Resolver" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> - <dependentAssembly><assemblyIdentity name="NuGet.Versioning" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.3.0.3" newVersion="5.3.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.Commands" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.Common" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.Configuration" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.Credentials" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.DependencyResolver.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.Frameworks" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.Indexing" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.LibraryModel" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.PackageManagement" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.Packaging" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.ProjectModel" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.Protocol" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.Resolver" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="NuGet.Versioning" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-5.4.0.3" newVersion="5.4.0.3" /></dependentAssembly> <dependentAssembly><assemblyIdentity name="SQLitePCLRaw.batteries_v2" culture="neutral" publicKeyToken="8226ea5df37bcae9" /><bindingRedirect oldVersion="0.0.0.0-1.1.12.351" newVersion="1.1.12.351" /></dependentAssembly> <dependentAssembly><assemblyIdentity name="SQLitePCLRaw.core" culture="neutral" publicKeyToken="1488e028ca7ab535" /><bindingRedirect oldVersion="0.0.0.0-1.1.12.351" newVersion="1.1.12.351" /></dependentAssembly> <dependentAssembly><assemblyIdentity name="StreamJsonRpc" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" /><bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" /></dependentAssembly> |