Merge pull request #33 from AvaloniaUI/11.1.0

11.1.0
AvaloniaUI · Jul 22, 2024 · 29b39cd · 29b39cd
2 parents 4af04b8 + 5be2ac8
commit 29b39cd
Show file tree

Hide file tree

Showing 64 changed files with 357 additions and 431 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![VS marketplace](https://img.shields.io/visual-studio-marketplace/v/AvaloniaTeam.TemplateStudioForAvalonia.svg?label=VS-Marketplace)](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.TemplateStudioForAvalonia)
+[![VS marketplace](https://img.shields.io/visual-studio-marketplace/v/AvaloniaTeam.TemplateStudioForAvalonia.svg?label=VS-Marketplace)](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.TemplateStudioForAvalonia)
 # Template Studio for Avalonia
 
 Template Studio is a Visual Studio 2022 extension that accelerate the creation of new Avalonia apps using a wizard-based experience.
@@ -29,7 +29,7 @@ Template Studio approaches app creation using the following six attribute sets:
 
 First, on which platforms you are planning to run your app?
 
-Options: **Desktop**, **Web**, **Andoid**, **IOS**.
+Options: **Desktop**, **Browser**, **Andoid**, **IOS**.
 
 ### **App design pattern**
 

diff --git a/code/ProjectTemplates/Avalonia/Cs/Ts4AvaloniaCsTemplate.vstemplate b/code/ProjectTemplates/Avalonia/Cs/Ts4AvaloniaCsTemplate.vstemplate
@@ -17,7 +17,7 @@
 		<ProjectTypeTag>Desktop</ProjectTypeTag>
         <ProjectTypeTag>Avalonia</ProjectTypeTag>
         <ProjectTypeTag>Mobile</ProjectTypeTag>
-        <ProjectTypeTag>Web</ProjectTypeTag>
+        <ProjectTypeTag>Browser</ProjectTypeTag>
         <ProjectTypeTag>XAML</ProjectTypeTag>
 	</TemplateData>
 	<TemplateContent>

diff --git a/code/ProjectTemplates/Avalonia/Fs/Ts4AvaloniaFsTemplate.vstemplate b/code/ProjectTemplates/Avalonia/Fs/Ts4AvaloniaFsTemplate.vstemplate
@@ -17,7 +17,7 @@
 		<ProjectTypeTag>Desktop</ProjectTypeTag>
         <ProjectTypeTag>Avalonia</ProjectTypeTag>
         <ProjectTypeTag>Mobile</ProjectTypeTag>
-        <ProjectTypeTag>Web</ProjectTypeTag>
+        <ProjectTypeTag>Browser</ProjectTypeTag>
         <ProjectTypeTag>XAML</ProjectTypeTag>
 	</TemplateData>
 	<TemplateContent>

diff --git a/code/TemplateStudioForAvalonia/TemplateStudioForAvalonia.csproj b/code/TemplateStudioForAvalonia/TemplateStudioForAvalonia.csproj
@@ -204,7 +204,7 @@
     <Content Include="Templates\_comp\_shared\Proj.CSharp.iOS\Param_ProjectName.iOS\Main.cs">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.CSharp.Web\Param_ProjectName.Browser\Program.cs">
+    <Content Include="Templates\_comp\_shared\Proj.CSharp.Browser\Param_ProjectName.Browser\Program.cs">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="Templates\_comp\MT\Project.CSharp.Android\Param_ProjectName.Android\MainActivity_postaction.cs">
@@ -270,7 +270,7 @@
     <Content Include="Templates\_catalog\projectTypes\Android.md">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_catalog\projectTypes\Web.md">
+    <Content Include="Templates\_catalog\projectTypes\Browser.md">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="Templates\_comp\MT\Project.CSharp\Param_ProjectName_postaction.csproj">
@@ -285,10 +285,13 @@
     <Content Include="Templates\_comp\_shared\Proj.CSharp.Desktop\Param_ProjectName.Desktop\Param_ProjectName.Desktop.csproj">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.CSharp.Web\Param_ProjectName.Browser\Properties\launchSettings.json">
+    <Content Include="Templates\_comp\_shared\Proj.CSharp.Browser\Param_ProjectName.Browser\Properties\launchSettings.json">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.CSharp.Web\Param_ProjectName.Browser\runtimeconfig.template.json">
+    <Content Include="Templates\_comp\_shared\Proj.CSharp.Browser\Param_ProjectName.Browser\Properties\AssemblyInfo.cs">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="Templates\_comp\_shared\Proj.CSharp.Browser\Param_ProjectName.Browser\runtimeconfig.template.json">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="Templates\_comp\_shared\Proj.CSharp.iOS\Param_ProjectName.iOS\Param_ProjectName.iOS.csproj">
@@ -393,31 +396,28 @@
     <Content Include="Templates\_comp\_shared\Proj.FSharp.iOS\Param_ProjectName.iOS\Resources\LaunchScreen.xib">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.FSharp.Web\Param_ProjectName.Browser\AppBundle\app.css">
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="Templates\_comp\_shared\Proj.FSharp.Web\Param_ProjectName.Browser\AppBundle\favicon.ico">
+    <Content Include="Templates\_comp\_shared\Proj.FSharp.Browser\Param_ProjectName.Browser\wwwroot\app.css">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.FSharp.Web\Param_ProjectName.Browser\AppBundle\index.html">
+    <Content Include="Templates\_comp\_shared\Proj.FSharp.Browser\Param_ProjectName.Browser\wwwroot\favicon.ico">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.FSharp.Web\Param_ProjectName.Browser\AppBundle\Logo.svg">
+    <Content Include="Templates\_comp\_shared\Proj.FSharp.Browser\Param_ProjectName.Browser\wwwroot\index.html">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.FSharp.Web\Param_ProjectName.Browser\AppBundle\main.js">
+    <Content Include="Templates\_comp\_shared\Proj.FSharp.Browser\Param_ProjectName.Browser\wwwroot\main.js">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.FSharp.Web\Param_ProjectName.Browser\Param_ProjectName.Browser.fsproj">
+    <Content Include="Templates\_comp\_shared\Proj.FSharp.Browser\Param_ProjectName.Browser\Param_ProjectName.Browser.fsproj">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.FSharp.Web\Param_ProjectName.Browser\Program.fs">
+    <Content Include="Templates\_comp\_shared\Proj.FSharp.Browser\Param_ProjectName.Browser\Program.fs">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.FSharp.Web\Param_ProjectName.Browser\Properties\launchSettings.json">
+    <Content Include="Templates\_comp\_shared\Proj.FSharp.Browser\Param_ProjectName.Browser\Properties\launchSettings.json">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.FSharp.Web\Param_ProjectName.Browser\runtimeconfig.template.json">
+    <Content Include="Templates\_comp\_shared\Proj.FSharp.Browser\Param_ProjectName.Browser\runtimeconfig.template.json">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="Templates\_comp\MT\Project.FSharp\.template.config\template.json">
@@ -447,10 +447,10 @@
     <Content Include="Templates\_comp\MT\Project.FSharp.iOS\Param_ProjectName.iOS\AppDelegate_postaction.fs">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\MT\Project.FSharp.Web\.template.config\template.json">
+    <Content Include="Templates\_comp\MT\Project.FSharp.Browser\.template.config\template.json">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\MT\Project.FSharp.Web\Param_ProjectName.Browser\Program_postaction.fs">
+    <Content Include="Templates\_comp\MT\Project.FSharp.Browser\Param_ProjectName.Browser\Program_postaction.fs">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="Templates\_comp\MT\Project.FSharp\Param_ProjectName\Param_ProjectName.fsproj">
@@ -527,7 +527,7 @@
       <SubType>Designer</SubType>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_catalog\projectTypes\Web.xaml">
+    <Content Include="Templates\_catalog\projectTypes\Browser.xaml">
       <SubType>Designer</SubType>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
@@ -583,7 +583,7 @@
     <Content Include="Templates\Proj\Default.CSharp\ts.ProjectName\Assets\avalonia-logo.ico">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\MT\Project.CSharp.Web\Param_ProjectName.Browser\Program_postaction.cs">
+    <Content Include="Templates\_comp\MT\Project.CSharp.Browser\Param_ProjectName.Browser\Program_postaction.cs">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="Templates\_comp\_shared\Proj.CSharp.Android\Param_ProjectName.Android\Icon.png">
@@ -628,7 +628,7 @@
     <Content Include="Templates\_comp\MT\Project.CSharp.Android\.template.config\template.json">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\MT\Project.CSharp.Web\.template.config\template.json">
+    <Content Include="Templates\_comp\MT\Project.CSharp.Browser\.template.config\template.json">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="Templates\_comp\MT\Project.CSharp.iOS\.template.config\template.json">
@@ -637,25 +637,22 @@
     <Content Include="Templates\_comp\MT\Project.CSharp\.template.config\template.json">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.CSharp.Web\.template.config\template.json">
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="Templates\_comp\_shared\Proj.CSharp.Web\Param_ProjectName.Browser\AppBundle\app.css">
+    <Content Include="Templates\_comp\_shared\Proj.CSharp.Browser\.template.config\template.json">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.CSharp.Web\Param_ProjectName.Browser\AppBundle\favicon.ico">
+    <Content Include="Templates\_comp\_shared\Proj.CSharp.Browser\Param_ProjectName.Browser\wwwroot\app.css">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.CSharp.Web\Param_ProjectName.Browser\AppBundle\index.html">
+    <Content Include="Templates\_comp\_shared\Proj.CSharp.Browser\Param_ProjectName.Browser\wwwroot\favicon.ico">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.CSharp.Web\Param_ProjectName.Browser\AppBundle\Logo.svg">
+    <Content Include="Templates\_comp\_shared\Proj.CSharp.Browser\Param_ProjectName.Browser\wwwroot\index.html">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.CSharp.Web\Param_ProjectName.Browser\AppBundle\main.js">
+    <Content Include="Templates\_comp\_shared\Proj.CSharp.Browser\Param_ProjectName.Browser\wwwroot\main.js">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.CSharp.Web\Param_ProjectName.Browser\Param_ProjectName.Browser.csproj">
+    <Content Include="Templates\_comp\_shared\Proj.CSharp.Browser\Param_ProjectName.Browser\Param_ProjectName.Browser.csproj">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="Templates\_comp\_shared\Proj.CSharp.Desktop\.template.config\template.json">
@@ -676,7 +673,7 @@
     <Content Include="Templates\_comp\_shared\Proj.CSharp.Android\.template.config\template.json">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Templates\_comp\_shared\Proj.FSharp.Web\.template.config\template.json">
+    <Content Include="Templates\_comp\_shared\Proj.FSharp.Browser\.template.config\template.json">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="Templates\_catalog\frontendframeworks\ReactiveUI.xaml">
@@ -695,4 +692,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/...lateStudioForAvalonia/Templates/Ft/CompiledBindings.CSharp/.template.config/template.json b/...lateStudioForAvalonia/Templates/Ft/CompiledBindings.CSharp/.template.config/template.json
@@ -40,12 +40,12 @@
             "datatype": "choice",
             "choices": [
                 {
-                    "choice": "net7.0",
-                    "description": "Target net7.0"
+                    "choice": "net8.0",
+                    "description": "Target net8.0"
                 }
             ],
             "replaces": "FrameworkParameter",
-            "defaultValue": "net7.0"
+            "defaultValue": "net8.0"
         }
     }
 }
diff --git a/...lateStudioForAvalonia/Templates/Ft/CompiledBindings.FSharp/.template.config/template.json b/...lateStudioForAvalonia/Templates/Ft/CompiledBindings.FSharp/.template.config/template.json
@@ -40,12 +40,12 @@
             "datatype": "choice",
             "choices": [
                 {
-                    "choice": "net7.0",
-                    "description": "Target net7.0"
+                    "choice": "net8.0",
+                    "description": "Target net8.0"
                 }
             ],
             "replaces": "FrameworkParameter",
-            "defaultValue": "net7.0"
+            "defaultValue": "net8.0"
         }
     }
 }
diff --git a/code/TemplateStudioForAvalonia/Templates/Ft/Embedded.CSharp/.template.config/template.json b/code/TemplateStudioForAvalonia/Templates/Ft/Embedded.CSharp/.template.config/template.json
@@ -45,12 +45,12 @@
             "datatype": "choice",
             "choices": [
                 {
-                    "choice": "net7.0",
-                    "description": "Target net7.0"
+                    "choice": "net8.0",
+                    "description": "Target net8.0"
                 }
             ],
             "replaces": "FrameworkParameter",
-            "defaultValue": "net7.0"
+            "defaultValue": "net8.0"
         }
     }
 }
diff --git a/code/TemplateStudioForAvalonia/Templates/Ft/Meadow.CSharp/.template.config/template.json b/code/TemplateStudioForAvalonia/Templates/Ft/Meadow.CSharp/.template.config/template.json
@@ -46,12 +46,12 @@
             "datatype": "choice",
             "choices": [
                 {
-                    "choice": "net7.0",
-                    "description": "Target net7.0"
+                    "choice": "net8.0",
+                    "description": "Target net8.0"
                 }
             ],
             "replaces": "FrameworkParameter",
-            "defaultValue": "net7.0"
+            "defaultValue": "net8.0"
         }
     }
 }
diff --git a/code/TemplateStudioForAvalonia/Templates/Proj/Default.CSharp/.template.config/template.json b/code/TemplateStudioForAvalonia/Templates/Proj/Default.CSharp/.template.config/template.json
@@ -13,7 +13,7 @@
         "language": "C#",
         "type": "project",
         "ts.type": "project",
-        "ts.projecttype": "Desktop|Web|IOS|Android",
+        "ts.projecttype": "Desktop|Browser|IOS|Android",
         "ts.frontendframework": "ReactiveUI|MVVMToolkit",
         "ts.platform": "Avalonia",
         "ts.outputToParent": "true",
@@ -38,12 +38,12 @@
             "datatype": "choice",
             "choices": [
                 {
-                    "choice": "net7.0",
-                    "description": "Target net7.0"
+                    "choice": "net8.0",
+                    "description": "Target net8.0"
                 }
             ],
             "replaces": "FrameworkParameter",
-            "defaultValue": "net7.0"
+            "defaultValue": "net8.0"
         },
         "HostIdentifier": {
             "type": "bind",

diff --git a/code/TemplateStudioForAvalonia/Templates/Proj/Default.CSharp/Directory.Build.props b/code/TemplateStudioForAvalonia/Templates/Proj/Default.CSharp/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.2</AvaloniaVersion>
+    <AvaloniaVersion>11.1.0</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/...plateStudioForAvalonia/Templates/Proj/Default.CSharp/ts.ProjectName/ts.ProjectName.csproj b/...plateStudioForAvalonia/Templates/Proj/Default.CSharp/ts.ProjectName/ts.ProjectName.csproj
@@ -5,13 +5,6 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
-  <!--#if (AvaloniaStableChosen) -->
-  <ItemGroup>
-    <ProjectCapability Include="Avalonia"/>
-    <TrimmerRootAssembly Include="Avalonia.Themes.Fluent" />
-  </ItemGroup>
-  <!--#endif -->
-
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
   </ItemGroup>
@@ -23,8 +16,5 @@
     <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-    <!--#if (AvaloniaStableChosen) -->
-    <PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
-    <!--#endif -->
   </ItemGroup>
 </Project>
diff --git a/code/TemplateStudioForAvalonia/Templates/Proj/Default.FSharp/.template.config/template.json b/code/TemplateStudioForAvalonia/Templates/Proj/Default.FSharp/.template.config/template.json
@@ -13,7 +13,7 @@
         "language": "F#",
         "type": "project",
         "ts.type": "project",
-        "ts.projecttype": "Desktop|Web|IOS|Android",
+        "ts.projecttype": "Desktop|Browser|IOS|Android",
         "ts.frontendframework": "ReactiveUI|MVVMToolkit",
         "ts.platform": "Avalonia",
         "ts.outputToParent": "true",
@@ -38,12 +38,12 @@
             "datatype": "choice",
             "choices": [
                 {
-                    "choice": "net7.0",
-                    "description": "Target net7.0"
+                    "choice": "net8.0",
+                    "description": "Target net8.0"
                 }
             ],
             "replaces": "FrameworkParameter",
-            "defaultValue": "net7.0"
+            "defaultValue": "net8.0"
         },
         "HostIdentifier": {
             "type": "bind",

diff --git a/code/TemplateStudioForAvalonia/Templates/Proj/Default.FSharp/Directory.Build.props b/code/TemplateStudioForAvalonia/Templates/Proj/Default.FSharp/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.2</AvaloniaVersion>
+    <AvaloniaVersion>11.1.0</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/code/TemplateStudioForAvalonia/Templates/_catalog/projectTypes.json b/code/TemplateStudioForAvalonia/Templates/_catalog/projectTypes.json
@@ -9,9 +9,9 @@
         "languages": [ "C#", "F#" ]
     },
     {
-        "name": "Web",
-        "displayName": "Web",
-        "summary": "This option allows you to run your project on Web using Web Assembly.",
+        "name": "Browser",
+        "displayName": "Browser",
+        "summary": "This option allows you to run your project on Browser using Web Assembly.",
         "author": "AvaloniaUI",
         "order": "2",
         "platform": "Avalonia",

diff --git a/code/TemplateStudioForAvalonia/Templates/_catalog/projectTypes/Browser.md b/code/TemplateStudioForAvalonia/Templates/_catalog/projectTypes/Browser.md
@@ -0,0 +1 @@
+Adds project which allows to run your apps on Browser using WASM.
diff --git a/.../Templates/_catalog/projectTypes/Web.xaml → ...plates/_catalog/projectTypes/Browser.xaml b/.../Templates/_catalog/projectTypes/Web.xaml → ...plates/_catalog/projectTypes/Browser.xaml
diff --git a/code/TemplateStudioForAvalonia/Templates/_catalog/projectTypes/Web.md b/code/TemplateStudioForAvalonia/Templates/_catalog/projectTypes/Web.md
diff --git a/...CSharp.Web/.template.config/template.json → ...rp.Browser/.template.config/template.json b/...CSharp.Web/.template.config/template.json → ...rp.Browser/.template.config/template.json
@@ -4,17 +4,17 @@
     "classifications": [
         "Universal"
     ],
-    "name": "ts.Avalonia.MVVMToolkit.Project.Web",
-    "shortName": "ts.Avalonia.MVVMToolkit.Project.Web",
-    "identity": "ts.Avalonia.MVVMToolkit.Project.Web",
+    "name": "ts.Avalonia.MVVMToolkit.Project.Browser",
+    "shortName": "ts.Avalonia.MVVMToolkit.Project.Browser",
+    "identity": "ts.Avalonia.MVVMToolkit.Project.Browser",
     "tags": {
         "language": "C#",
         "type": "item",
         "ts.type": "composition",
         "ts.outputToParent": "true",
         "ts.platform": "Avalonia",
         "ts.version": "1.0.0",
-        "ts.compositionFilter": "$projectType == Web & $frontendframework == MVVMToolkit & ts.type == project"
+        "ts.compositionFilter": "$projectType == Browser & $frontendframework == MVVMToolkit & ts.type == project"
     },
     "sourceName": "ts.ItemName",
     "preferNameDirectory": true,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Adds project which allows to run your apps on Browser using WASM.