Update VS extensions

- Rename MonoDevelop to VisualStudio.Mac - Rename VisualStudio to VisualStudio.Win - Complete xmlns properly - Update designer when resetting size so it applies properly - Support plain text in TableRow and TableCell in Xaml for labels
picoe · Mar 22, 2021 · 47793de · 47793de
1 parent 40527fd
commit 47793de
Show file tree

Hide file tree

Showing 172 changed files with 437 additions and 590 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: addins
-        path: artifacts/addin/${{ env.BuildConfiguration }}/VisualStudio/Eto.Addin.VisualStudio*.vsix
+        path: artifacts/addin/${{ env.BuildConfiguration }}/VisualStudio/Eto.Addin.VisualStudio.Win*.vsix
 
     - name: Upload test artifacts
       uses: actions/upload-artifact@v2
@@ -132,7 +132,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: addins
-        path: artifacts/addin/${{ env.BuildConfiguration }}/net472/Eto.Addin.MonoDevelop*.mpack
+        path: artifacts/addin/${{ env.BuildConfiguration }}/net472/Eto.Addin.VisualStudio.Mac*.mpack
 
     - name: Upload test artifacts
       uses: actions/upload-artifact@v2
@@ -178,8 +178,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: Eto.Addin.VisualStudio-${{ steps.get_version.outputs.VERSION }}.vsix
-          asset_name: Eto.Addin.VisualStudio-${{ steps.get_version.outputs.VERSION }}.vsix
+          asset_path: Eto.Addin.VisualStudio.Win-${{ steps.get_version.outputs.VERSION }}.vsix
+          asset_name: Eto.Addin.VisualStudio.Win-${{ steps.get_version.outputs.VERSION }}.vsix
           asset_content_type: application/octet-stream
 
       - name: Upload VS/Mac addin
@@ -188,8 +188,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: Eto.Addin.MonoDevelop-${{ steps.get_version.outputs.VERSION }}.mpack
-          asset_name: Eto.Addin.MonoDevelop-${{ steps.get_version.outputs.VERSION }}.mpack
+          asset_path: Eto.Addin.VisualStudio.Mac-${{ steps.get_version.outputs.VERSION }}.mpack
+          asset_name: Eto.Addin.VisualStudio.Mac-${{ steps.get_version.outputs.VERSION }}.mpack
           asset_content_type: application/octet-stream
 
   publish:

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/build/Build.proj b/build/Build.proj
@@ -44,14 +44,14 @@
       Pattern='(?&lt;=&lt;Version\s*[^&gt;]+?&gt;)[^&lt;]+(?=&lt;/Version&gt;)'
       Replacement='$(AssemblyVersion)' />
 
-    <FileUpdate Files="$(AddinDir)Eto.Addin.MonoDevelop\Properties\AddinInfo.cs"
+    <FileUpdate Files="$(AddinDir)Eto.Addin.VisualStudio.Mac\Properties\AddinInfo.cs"
       WarnOnNoUpdate="true"
       Pattern='(?&lt;=^\s*Version\s*=\s*[&quot;])(.+?)(?=[&quot;]\s*$)'
       Replacement='$(AssemblyVersionBeforeRelease)' />
 
-    <FileUpdate Files="$(AddinDir)Eto.Addin.VisualStudio\source.extension.vsixmanifest"
+    <FileUpdate Files="$(AddinDir)Eto.Addin.VisualStudio.Win\source.extension.vsixmanifest"
       WarnOnNoUpdate="true"
-      Pattern='(?&lt;=^\s*&lt;Identity\s+Id=&quot;Eto.Addin.VisualStudio&quot;.+?Version=&quot;)(.+?)(?=&quot;\s+)'
+      Pattern='(?&lt;=^\s*&lt;Identity\s+Id=&quot;Eto.Addin.VisualStudio.Win&quot;.+?Version=&quot;)(.+?)(?=&quot;\s+)'
       Replacement='$(AssemblyVersionBeforeRelease)' />
 
     <PropertyGroup>
@@ -80,9 +80,9 @@
 
     <ItemGroup>
       <TemplateFiles Include="$(TemplateFiles)" Condition="$(TemplateFiles) != ''" />
-      <TemplateFiles Include="$(SourceDir)Addins\Eto.Addin.VisualStudio\**\*.vstemplate" />
-      <TemplateFiles Include="$(SourceDir)Addins\Eto.Addin.MonoDevelop\**\*.xpt.xml" />
-      <TemplateFiles Include="$(SourceDir)Addins\Eto.Addin.MonoDevelop\Properties\Manifest.addin.xml" />
+      <TemplateFiles Include="$(SourceDir)Addins\Eto.Addin.VisualStudio.Win\**\*.vstemplate" />
+      <TemplateFiles Include="$(SourceDir)Addins\Eto.Addin.VisualStudio.Mac\**\*.xpt.xml" />
+      <TemplateFiles Include="$(SourceDir)Addins\Eto.Addin.VisualStudio.Mac\Properties\Manifest.addin.xml" />
 
       <ProjFiles Include="$(ProjFiles)" Condition="$(ProjFiles) != ''" />
       <ProjFiles Include="$(BasePath)**\*.csproj" />
@@ -221,14 +221,14 @@
 
   <!-- build the MD/VS for Mac and/or the VS addin, depending on your platform -->
   <Target Name="BuildAddins" DependsOnTargets="PrintInfo">
-    <!-- monodevelop/VS for Mac -->
-    <MSBuild Projects="$(AddinDir)Eto.Addin.MonoDevelop.sln" Targets="Restore" Properties="Configuration=$(Configuration);_RestoreEnforceEvaluate=True" Condition="$(HasVSMac) == 'True'" />
-    <MSBuild Projects="$(AddinDir)Eto.Addin.MonoDevelop.sln" Targets="Build" Properties="Configuration=$(Configuration)" Condition="$(HasVSMac) == 'True'" />
-    <MSBuild Projects="$(AddinDir)Eto.Addin.MonoDevelop\Eto.Addin.MonoDevelop.csproj" Targets="PackageAddin" Properties="Configuration=$(Configuration)" Condition="$(HasVSMac) == 'True'" />
+    <!-- VS for Mac -->
+    <MSBuild Projects="$(AddinDir)Eto.Addin.VisualStudio.Mac.sln" Targets="Restore" Properties="Configuration=$(Configuration);_RestoreEnforceEvaluate=True" Condition="$(HasVSMac) == 'True'" />
+    <MSBuild Projects="$(AddinDir)Eto.Addin.VisualStudio.Mac.sln" Targets="Build" Properties="Configuration=$(Configuration)" Condition="$(HasVSMac) == 'True'" />
+    <MSBuild Projects="$(AddinDir)Eto.Addin.VisualStudio.Mac\Eto.Addin.VisualStudio.Mac.csproj" Targets="PackageAddin" Properties="Configuration=$(Configuration)" Condition="$(HasVSMac) == 'True'" />
 
     <!-- Visual Studio Addin -->
-    <MSBuild Projects="$(AddinDir)Eto.Addin.VisualStudio.sln" Targets="Restore" Properties="Configuration=$(Configuration);_RestoreEnforceEvaluate=True" Condition="$(HasVSWin) == 'True'" />
-    <MSBuild Projects="$(AddinDir)Eto.Addin.VisualStudio.sln" Targets="Build" Properties="Configuration=$(Configuration);DeployExtension=false" Condition="$(HasVSWin) == 'True'" />
+    <MSBuild Projects="$(AddinDir)Eto.Addin.VisualStudio.Win.sln" Targets="Restore" Properties="Configuration=$(Configuration);_RestoreEnforceEvaluate=True" Condition="$(HasVSWin) == 'True'" />
+    <MSBuild Projects="$(AddinDir)Eto.Addin.VisualStudio.Win.sln" Targets="Build" Properties="Configuration=$(Configuration);DeployExtension=false" Condition="$(HasVSWin) == 'True'" />
   </Target>
 
   <Target Name="Clean">

diff --git a/build/Common.props b/build/Common.props
@@ -27,7 +27,7 @@
   <PropertyGroup>
     <!-- global nuget/assembly properties -->
 
-    <DevVersion>2.5.9</DevVersion>
+    <DevVersion>2.5.11</DevVersion>
 
     <Version Condition="$(Version) == ''">2.5.0.0</Version>
 

diff --git a/src/Addins/Eto.Addin.MonoDevelop/VBDotNetProjectExtension.cs b/src/Addins/Eto.Addin.MonoDevelop/VBDotNetProjectExtension.cs
diff --git a/src/Addins/Eto.Addin.MonoDevelop.sln → src/Addins/Eto.Addin.VisualStudio.Mac.sln b/src/Addins/Eto.Addin.MonoDevelop.sln → src/Addins/Eto.Addin.VisualStudio.Mac.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Addin.MonoDevelop", "Eto.Addin.MonoDevelop\Eto.Addin.MonoDevelop.csproj", "{54A88D77-39C6-49E5-971E-05451209F2A9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Addin.VisualStudio.Mac", "Eto.Addin.VisualStudio.Mac\Eto.Addin.VisualStudio.Mac.csproj", "{54A88D77-39C6-49E5-971E-05451209F2A9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Addin.Shared", "Eto.Addin.Shared\Eto.Addin.Shared.csproj", "{EE6AD588-50FE-4C4B-BBFE-AB1C2B120DE0}"
 EndProject

diff --git a/...ddin.MonoDevelop/Editor/DisplayBinding.cs → ...VisualStudio.Mac/Editor/DisplayBinding.cs b/...ddin.MonoDevelop/Editor/DisplayBinding.cs → ...VisualStudio.Mac/Editor/DisplayBinding.cs
@@ -11,7 +11,7 @@
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 
-namespace Eto.Addin.MonoDevelop.Editor
+namespace Eto.Addin.VisualStudio.Mac.Editor
 {
 	public class DisplayBinding : IViewDisplayBinding, IDisplayBinding
 	{

diff --git a/...n.MonoDevelop/Editor/DisplayController.cs → ...ualStudio.Mac/Editor/DisplayController.cs b/...n.MonoDevelop/Editor/DisplayController.cs → ...ualStudio.Mac/Editor/DisplayController.cs
@@ -12,7 +12,7 @@
 using MonoDevelop.Ide.Gui.Documents;
 using MonoDevelop.Projects;
 
-namespace Eto.Addin.MonoDevelop.Editor
+namespace Eto.Addin.VisualStudio.Mac.Editor
 {
 	[ExportDocumentControllerFactory(Id = "EtoFormsDesigner", MimeType = "*", InsertBefore = "MonoDevelop.TextEditor.CocoaTextViewDisplayBinding")]
 	public class DesignerDisplayBinding : FileDocumentControllerFactory
@@ -49,12 +49,11 @@ public override async Task<DocumentController> CreateController(FileDescriptor f
 			return new EtoDesignerViewContent(existing);
 		}
 
-		public override string Id => "Eto.Addin.MonoDevelop.Editor.DesignerDisplayBinding";
+		public override string Id => "Eto.Addin.VisualStudio.Mac.Editor.DesignerDisplayBinding";
 	}
 
 	class EtoDesignerViewContent : DocumentController
 	{
-		bool isClosed;
 		FileDocumentController _inner;
 		public EtoDesignerViewContent(FileDocumentController inner)
 		{

diff --git a/...to.Addin.MonoDevelop/Editor/EditorView.cs → ...din.VisualStudio.Mac/Editor/EditorView.cs b/...to.Addin.MonoDevelop/Editor/EditorView.cs → ...din.VisualStudio.Mac/Editor/EditorView.cs
@@ -21,7 +21,7 @@
 using Microsoft.CodeAnalysis.Text;
 using md = MonoDevelop;
 
-namespace Eto.Addin.MonoDevelop.Editor
+namespace Eto.Addin.VisualStudio.Mac.Editor
 {
 
 	public class EditorView : ViewContent, ICommandRouter