From 989469db9e2749ac8e69b8ea8a5bde06451b7c23 Mon Sep 17 00:00:00 2001 From: Virgile Bello Date: Sat, 26 Jan 2019 17:22:01 +0900 Subject: [PATCH] [GameStudio] Switch to Roslyn 2.10 --- deps/RoslynPad/LICENSE | 202 ++++++++++++++++++ deps/RoslynPad/README.md | 1 + deps/RoslynPad/RoslynPad.Editor.Windows.dll | 3 + deps/RoslynPad/RoslynPad.Editor.Windows.pdb | 3 + deps/RoslynPad/RoslynPad.Roslyn.Windows.dll | 3 + deps/RoslynPad/RoslynPad.Roslyn.Windows.pdb | 3 + deps/RoslynPad/RoslynPad.Roslyn.dll | 3 + deps/RoslynPad/RoslynPad.Roslyn.pdb | 3 + .../Xenko.Core.Assets.Quantum.csproj | 2 +- .../Xenko.Core.Tasks/Xenko.Core.Tasks.csproj | 2 +- .../AssetEditors/ScriptEditor/RoslynHost.cs | 42 +--- .../UIEditor/ViewModels/PanelViewModel.cs | 1 - .../Xenko.Assets.Presentation.csproj | 14 +- .../Xenko.Core.Assets.Editor.csproj | 2 +- .../engine/Xenko.Assets/Xenko.Assets.csproj | 11 +- .../Xenko.Debugger/Xenko.Debugger.csproj | 5 +- 16 files changed, 249 insertions(+), 51 deletions(-) create mode 100644 deps/RoslynPad/LICENSE create mode 100644 deps/RoslynPad/README.md create mode 100644 deps/RoslynPad/RoslynPad.Editor.Windows.dll create mode 100644 deps/RoslynPad/RoslynPad.Editor.Windows.pdb create mode 100644 deps/RoslynPad/RoslynPad.Roslyn.Windows.dll create mode 100644 deps/RoslynPad/RoslynPad.Roslyn.Windows.pdb create mode 100644 deps/RoslynPad/RoslynPad.Roslyn.dll create mode 100644 deps/RoslynPad/RoslynPad.Roslyn.pdb diff --git a/deps/RoslynPad/LICENSE b/deps/RoslynPad/LICENSE new file mode 100644 index 0000000000..e06d208186 --- /dev/null +++ b/deps/RoslynPad/LICENSE @@ -0,0 +1,202 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/deps/RoslynPad/README.md b/deps/RoslynPad/README.md new file mode 100644 index 0000000000..3b7a8ad2e2 --- /dev/null +++ b/deps/RoslynPad/README.md @@ -0,0 +1 @@ +Version: https://github.com/aelij/RoslynPad/commit/184451f2fc3552c9fa8c99bf7e3b8d11334a18b2 \ No newline at end of file diff --git a/deps/RoslynPad/RoslynPad.Editor.Windows.dll b/deps/RoslynPad/RoslynPad.Editor.Windows.dll new file mode 100644 index 0000000000..4d29943daa --- /dev/null +++ b/deps/RoslynPad/RoslynPad.Editor.Windows.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9fa4e2916bb2fa965d1f21b3bdd24b387261e91694f96576c770cd3af0c87a0 +size 130560 diff --git a/deps/RoslynPad/RoslynPad.Editor.Windows.pdb b/deps/RoslynPad/RoslynPad.Editor.Windows.pdb new file mode 100644 index 0000000000..1a34753535 --- /dev/null +++ b/deps/RoslynPad/RoslynPad.Editor.Windows.pdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afb793797a1fcc2319ac08625a71455c43ab80c8760584fb54d589621aaeb017 +size 30056 diff --git a/deps/RoslynPad/RoslynPad.Roslyn.Windows.dll b/deps/RoslynPad/RoslynPad.Roslyn.Windows.dll new file mode 100644 index 0000000000..89ac0046de --- /dev/null +++ b/deps/RoslynPad/RoslynPad.Roslyn.Windows.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af6091435a373053625f7a51e255cde836f70215fc6d57032b0a91b0351c4db0 +size 104448 diff --git a/deps/RoslynPad/RoslynPad.Roslyn.Windows.pdb b/deps/RoslynPad/RoslynPad.Roslyn.Windows.pdb new file mode 100644 index 0000000000..21348e9ce1 --- /dev/null +++ b/deps/RoslynPad/RoslynPad.Roslyn.Windows.pdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cda968adc1a84a2920112324d9dedf4d949259161e8fad366bac4a50f7f39f08 +size 8388 diff --git a/deps/RoslynPad/RoslynPad.Roslyn.dll b/deps/RoslynPad/RoslynPad.Roslyn.dll new file mode 100644 index 0000000000..1397985c63 --- /dev/null +++ b/deps/RoslynPad/RoslynPad.Roslyn.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83d15236ab583389e4bd2d5fd3c1d688d5a3a08a9dacfb9483a38913d4484d9e +size 190976 diff --git a/deps/RoslynPad/RoslynPad.Roslyn.pdb b/deps/RoslynPad/RoslynPad.Roslyn.pdb new file mode 100644 index 0000000000..1b2d2d59de --- /dev/null +++ b/deps/RoslynPad/RoslynPad.Roslyn.pdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cdc6b380ca86362d98e9293a1e43d24edfb334e8b1915120d657f8009f1d121 +size 50872 diff --git a/sources/assets/Xenko.Core.Assets.Quantum/Xenko.Core.Assets.Quantum.csproj b/sources/assets/Xenko.Core.Assets.Quantum/Xenko.Core.Assets.Quantum.csproj index 5ff08f3d8f..e2709f27e1 100644 --- a/sources/assets/Xenko.Core.Assets.Quantum/Xenko.Core.Assets.Quantum.csproj +++ b/sources/assets/Xenko.Core.Assets.Quantum/Xenko.Core.Assets.Quantum.csproj @@ -15,7 +15,7 @@ - + diff --git a/sources/core/Xenko.Core.Tasks/Xenko.Core.Tasks.csproj b/sources/core/Xenko.Core.Tasks/Xenko.Core.Tasks.csproj index ab48af301b..f8e36760b4 100644 --- a/sources/core/Xenko.Core.Tasks/Xenko.Core.Tasks.csproj +++ b/sources/core/Xenko.Core.Tasks/Xenko.Core.Tasks.csproj @@ -33,7 +33,7 @@ True - + diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/RoslynHost.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/RoslynHost.cs index 44499d9be2..bd08a76c28 100644 --- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/RoslynHost.cs +++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/RoslynHost.cs @@ -55,32 +55,20 @@ private static CompositionHost CreateCompositionContext() { var assemblies = new[] { - Assembly.Load("Microsoft.CodeAnalysis"), - Assembly.Load("Microsoft.CodeAnalysis.CSharp"), + Assembly.Load("Microsoft.CodeAnalysis.Workspaces"), + Assembly.Load("Microsoft.CodeAnalysis.CSharp.Workspaces"), Assembly.Load("Microsoft.CodeAnalysis.Features"), Assembly.Load("Microsoft.CodeAnalysis.CSharp.Features"), - Assembly.Load("Microsoft.CodeAnalysis.Workspaces.Desktop"), + Assembly.Load("Microsoft.CodeAnalysis.Workspaces.MSBuild"), typeof(IRoslynHost).Assembly, // RoslynPad.Roslyn - typeof(SymbolDisplayPartExtensions).Assembly, // RoslynPad.Roslyn.Windows - typeof(AvalonEditTextContainer).Assembly, // RoslynPad.Editor.Windows }; - var partTypes = MefHostServices.DefaultAssemblies.Concat(assemblies) - .Distinct() - .SelectMany(x => x.GetTypes()) - //.Concat(new[] { typeof(DocumentationProviderServiceFactory) }) - .ToArray(); - - //var partTypes = new[] - //{ - // Assembly.Load("Microsoft.CodeAnalysis.EditorFeatures").GetType("Microsoft.CodeAnalysis.CodeFixes.CodeFixService"), - // //typeof(RoslynDocumentTrackingServiceFactory), - //}; + var partTypes = assemblies + .SelectMany(x => x.DefinedTypes) + .Select(x => x.AsType()); return new ContainerConfiguration() - //.WithAssemblies(MefHostServices.DefaultAssemblies.Concat(assemblies)) .WithParts(partTypes) - .WithDefaultConventions(new AttributeFilterProvider()) .CreateContainer(); } @@ -130,23 +118,5 @@ public void CloseDocument(DocumentId documentId) { workspace.CloseDocument(documentId); } - - // Note: from RoslynPad, need to check if really necessary - private class AttributeFilterProvider : AttributedModelProvider - { - public override IEnumerable GetCustomAttributes(Type reflectedType, MemberInfo member) - { - var customAttributes = member.GetCustomAttributes().Where(x => !(x is ExtensionOrderAttribute)).ToArray(); - //ReplaceMefV1Attributes(customAttributes); - return customAttributes; - } - - public override IEnumerable GetCustomAttributes(Type reflectedType, ParameterInfo member) - { - var customAttributes = member.GetCustomAttributes().Where(x => !(x is ExtensionOrderAttribute)).ToArray(); - //ReplaceMefV1Attributes(customAttributes); - return customAttributes; - } - } } } diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/ViewModels/PanelViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/ViewModels/PanelViewModel.cs index ed8785b59a..c6952d3cf5 100644 --- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/ViewModels/PanelViewModel.cs +++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/ViewModels/PanelViewModel.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Isam.Esent.Interop; using Xenko.Core.Assets; using Xenko.Core.Assets.Quantum; using Xenko.Core; diff --git a/sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.csproj b/sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.csproj index cf40801c03..1065a26955 100644 --- a/sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.csproj +++ b/sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.csproj @@ -18,7 +18,10 @@ - + + + + $(XenkoCommonDependenciesDir)GraphX\QuickGraph.dll @@ -28,6 +31,15 @@ $(XenkoCommonDependenciesDir)GraphX\GraphX.WPF.Controls.dll + + $(XenkoCommonDependenciesDir)RoslynPad\RoslynPad.Editor.Windows.dll + + + $(XenkoCommonDependenciesDir)RoslynPad\RoslynPad.Roslyn.Windows.dll + + + $(XenkoCommonDependenciesDir)RoslynPad\RoslynPad.Roslyn.dll + diff --git a/sources/editor/Xenko.Core.Assets.Editor/Xenko.Core.Assets.Editor.csproj b/sources/editor/Xenko.Core.Assets.Editor/Xenko.Core.Assets.Editor.csproj index cc79c7c1de..21e71b36ec 100644 --- a/sources/editor/Xenko.Core.Assets.Editor/Xenko.Core.Assets.Editor.csproj +++ b/sources/editor/Xenko.Core.Assets.Editor/Xenko.Core.Assets.Editor.csproj @@ -10,7 +10,7 @@ - + diff --git a/sources/engine/Xenko.Assets/Xenko.Assets.csproj b/sources/engine/Xenko.Assets/Xenko.Assets.csproj index 58c56e1153..a14db34717 100644 --- a/sources/engine/Xenko.Assets/Xenko.Assets.csproj +++ b/sources/engine/Xenko.Assets/Xenko.Assets.csproj @@ -19,18 +19,15 @@ - - - - - + + False ..\..\..\deps\SSH.NET\Renci.SshNet.dll - + @@ -46,7 +43,7 @@ - + diff --git a/sources/engine/Xenko.Debugger/Xenko.Debugger.csproj b/sources/engine/Xenko.Debugger/Xenko.Debugger.csproj index fdb310ca11..952d614ab0 100644 --- a/sources/engine/Xenko.Debugger/Xenko.Debugger.csproj +++ b/sources/engine/Xenko.Debugger/Xenko.Debugger.csproj @@ -10,9 +10,8 @@ true $(TargetFrameworkTool) WindowsTools - - - + AnyCPU + true