Merge development and bump version to 3.0.0-preview.3

src/.editorconfig → .editorconfig

@@ -27,7 +27,7 @@ dotnet_style_collection_initializer = true:suggestion
 dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 dotnet_style_prefer_conditional_expression_over_assignment = true:silent
 dotnet_style_prefer_conditional_expression_over_return = true:silent
-dotnet_style_explicit_tuple_names = false:silent
+dotnet_style_explicit_tuple_names = true:suggestion
 dotnet_style_prefer_inferred_tuple_names = true:suggestion
 dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_prefer_compound_assignment = true:suggestion

.github/workflows/docs.yaml

@@ -1,30 +1,28 @@
-name: DotNet Docs
+name: wpfui-docs
 
 on:
-  pull_request:
-    branches: [development]
-  push:
-    branches: [development]
+    push:
+        branches: [main]
 
-  workflow_dispatch:
+    workflow_dispatch:
 
 jobs:
-  publish-docs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Chekout
-        uses: actions/checkout@v3
-      - name: Dotnet Setup
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: 7.x
+    publish_docs:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Chekout
+              uses: actions/checkout@v3
+            - name: Dotnet Setup
+              uses: actions/setup-dotnet@v3
+              with:
+                  dotnet-version: 7.x
 
-      - run: dotnet tool update -g docfx
-      - run: docfx docs/docfx.json
+            - run: dotnet tool update -g docfx
+            - run: docfx docs/docfx.json
 
-      - name: Deploy
+            - name: Deploy
 
-    uses: peaceiris/actions-gh-pages@v3
-    with:
-      github_token: ${{ secrets.GITHUB_TOKEN }}
-      publish_dir: docs/_site
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+            github_token: ${{ secrets.GITHUB_TOKEN }}
+            publish_dir: docs/_site

.github/workflows/labeler.yml

@@ -1,14 +1,15 @@
-name: "Pull Request Labeler"
+name: wpfui-labeler
+
 on:
-  - pull_request_target
+    - pull_request_target
 
 jobs:
-  triage:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/labeler@v4
-        with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+    triage:
+        permissions:
+            contents: read
+            pull-requests: write
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/labeler@v4
+              with:
+                  repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/lock.yml

@@ -1,20 +1,20 @@
-name: "Lock"
+name: wpfui-lock
 
 on:
-  schedule:
-    - cron: "0 0 * * *"
+    schedule:
+        - cron: "0 0 * * *"
 
 jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v4
-        with:
-          # https://github.com/dessant/lock-threads
-          github-token: ${{ github.token }}
-          issue-inactive-days: "90"
-          exclude-issue-created-before: ""
-          exclude-any-issue-labels: "keep-unlocked, status:awaiting response"
-          add-issue-labels: "locked-due-to-inactivity"
-          issue-comment: ""
-          issue-lock-reason: "resolved"
+    lock:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: dessant/lock-threads@v4
+              with:
+                  # https://github.com/dessant/lock-threads
+                  github-token: ${{ github.token }}
+                  issue-inactive-days: "90"
+                  exclude-issue-created-before: ""
+                  exclude-any-issue-labels: "keep-unlocked, status:awaiting response"
+                  add-issue-labels: "locked-due-to-inactivity"
+                  issue-comment: ""
+                  issue-lock-reason: "resolved"

.github/workflows/wpf-ui-pr-deploy.yaml

@@ -0,0 +1,31 @@
+name: wpfui-pr-deploy
+
+on:
+    push:
+        branches: [main]
+
+    workflow_dispatch:
+
+jobs:
+    build:
+        runs-on: windows-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: microsoft/setup-msbuild@v1.3
+              with:
+                  msbuild-architecture: x64
+            - uses: nuget/setup-nuget@v1
+              with:
+                  nuget-api-key: ${{ secrets.NUGET_API_KEY }}
+
+            - name: Restore dependencies
+              run: nuget restore Wpf.Ui.sln
+
+            - name: Build the solution
+              run: msbuild src\Wpf.Ui\Wpf.Ui.csproj -p:Configuration=Release -p:Platform="Any CPU" -p:GITHUB_ACTIONS=True -p:ContinuousIntegrationBuild=true -m -graph -isolate
+
+            - name: Publish the package to NuGet.org
+              run: nuget push src\Wpf.Ui\bin\Release\*.nupkg -NonInteractive -SkipDuplicate -Source 'https://api.nuget.org/v3/index.json'
+
+            - name: Publish the symbols to NuGet.org
+              run: nuget push src\Wpf.Ui\bin\Release\*.snupkg -NonInteractive -SkipDuplicate -Source 'https://api.nuget.org/v3/index.json'

.github/workflows/wpf-ui-pr-validator.yaml

@@ -0,0 +1,27 @@
+name: wpfui-pr-validator
+
+on:
+    pull_request:
+        branches: [development]
+    push:
+        branches: [development]
+
+    workflow_dispatch:
+
+jobs:
+    build:
+        runs-on: windows-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: microsoft/setup-msbuild@v1.3
+              with:
+                  msbuild-architecture: x64
+            - uses: nuget/setup-nuget@v1
+              with:
+                  nuget-api-key: ${{ secrets.NUGET_API_KEY }}
+
+            - name: Restore dependencies
+              run: nuget restore Wpf.Ui.sln
+
+            - name: Build the solution
+              run: msbuild src\Wpf.Ui.Gallery\Wpf.Ui.Gallery.csproj -p:Configuration=Release -p:Platform="Any CPU" -p:GITHUB_ACTIONS=True -p:ContinuousIntegrationBuild=true -m -graph -isolate

src/Directory.Build.props → Directory.Build.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>3.0.0-preview.2</Version>
+    <Version>3.0.0-preview.3</Version>
     <LangVersion>11.0</LangVersion>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
@@ -35,4 +35,10 @@
     <None Include="..\..\README.md" Pack="true" PackagePath="\"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>$(MSBuildProjectName).UnitTests</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
 </Project>

src/Directory.Packages.props → Directory.Packages.props

@@ -1,17 +1,22 @@
 <Project>
   <ItemGroup>
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.0.0" />
+    <PackageVersion Include="coverlet.collector" Version="3.2.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.2.3194" />
     <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.3.32804.24" />
     <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.4.2118" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.1462.37" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
+    <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="NativeMethods" Version="0.0.3" />
     <PackageVersion Include="PolySharp" Version="1.12.1" />
     <PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="xunit" Version="2.4.2" />
   </ItemGroup>
 </Project>

Wpf.Ui.Gallery.slnf

@@ -0,0 +1,10 @@
+{
+  "solution": {
+    "path": "Wpf.Ui.sln",
+    "projects": [
+      "src\\Wpf.Ui.Gallery.Package\\Wpf.Ui.Gallery.Package.wapproj",
+      "src\\Wpf.Ui.Gallery\\Wpf.Ui.Gallery.csproj",
+      "src\\Wpf.Ui\\Wpf.Ui.csproj"
+    ]
+  }
+}

Wpf.Ui.Library.slnf

@@ -0,0 +1,8 @@
+{
+  "solution": {
+    "path": "Wpf.Ui.sln",
+    "projects": [
+      "src\\Wpf.Ui\\Wpf.Ui.csproj"
+    ]
+  }
+}