Merge branch 'release/4.9.0'

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "cake.tool": {
+      "version": "3.0.0",
+      "commands": [
+        "dotnet-cake"
+      ]
+    }
+  }
+}

.github/dependabot.yml

@@ -0,0 +1,23 @@
+version: 2
+registries:
+  nuget-feed-default:
+    type: nuget-feed
+    url: https://api.nuget.org/v3/index.json
+
+updates:
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: weekly
+
+- package-ecosystem: nuget
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: "*Analyzers"
+    versions:
+    - ">= 0"
+  registries:
+  - nuget-feed-default

.github/workflows/dependabot-auto-merge.yml

@@ -0,0 +1,40 @@
+name: Dependabot auto-merge
+on: pull_request_target
+permissions:
+  pull-requests: write
+  contents: write
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    # Checking the actor will prevent your Action run failing on non-Dependabot PRs
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: dependabot-metadata
+        uses: dependabot/[email protected]
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Approve Dependabot PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Enable auto-merge for Dependabot PRs
+        if: |
+            (startsWith(steps.dependabot-metadata.outputs.dependency-names, 'approvaltests.') || 
+             startsWith(steps.dependabot-metadata.outputs.dependency-names, 'catel.') ||
+             startsWith(steps.dependabot-metadata.outputs.dependency-names, 'fody') ||
+             endsWith(steps.dependabot-metadata.outputs.dependency-names,   '.fody') ||
+             startsWith(steps.dependabot-metadata.outputs.dependency-names, 'microsoft.') ||
+             startsWith(steps.dependabot-metadata.outputs.dependency-names, 'nunit') ||
+             startsWith(steps.dependabot-metadata.outputs.dependency-names, 'nunit3testadapter') ||
+             startsWith(steps.dependabot-metadata.outputs.dependency-names, 'orc.') || 
+             startsWith(steps.dependabot-metadata.outputs.dependency-names, 'orchestra.') ||
+             startsWith(steps.dependabot-metadata.outputs.dependency-names, 'verify.')) &&
+            (steps.dependabot-metadata.outputs.update-type == 'version-update:semver-minor' ||
+             steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch')
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          PR_NUMBER: ${{github.event.pull_request.number}}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -135,10 +135,17 @@ TestResults
 .github/
 BundleArtifacts/
 
+# docker / tye
+.tye
+
 # editors
 .idea
 .vscode
 
+# Binaries
+*.dll
+*.exe
+
 # fody
 FodyWeavers.xsd
 
@@ -148,3 +155,7 @@ FodyWeavers.xsd
 # ANTLR
 data/dsl/*.class
 data/dsl/*.java
+
+# Nodejs / NPM
+node_modules
+package-lock.json

build.cake

@@ -8,11 +8,18 @@ Parameters["SolutionName"] = "Catel.Fody";
 Parameters["Company"] = "CatenaLogic";
 Parameters["RepositoryUrl"] = string.Format("https://github.com/{0}/{1}", GetBuildServerVariable("SolutionName"), GetBuildServerVariable("SolutionName"));
 Parameters["StartYear"] = "2010";
-Parameters["UseVisualStudioPrerelease"] = "false";
-Parameters["DeployCatelFodyAttributes"] = "false";
+Parameters["UseVisualStudioPrerelease"] = "true";
+
+// Note: Catel.Fody is a special project where the Attributes projects generates
+// the correct package with both the attributes *and* the weaver. We should build 
+// and package Catel.Fody.Attributes, but Catel.Fody is the package that needs to be
+// deployed
 Parameters["BuildCatelFody"] = "true";
-Parameters["DeployCatelFody"] = "false";
-Parameters["DeployCatelFodyAttributes"] = "true";
+Parameters["PackageCatelFody"] = "true";
+Parameters["DeployCatelFody"] = "true";
+Parameters["BuildCatelFodyAttributes"] = "true";
+Parameters["PackageCatelFodyAttributes"] = "true";
+Parameters["DeployCatelFodyAttributes"] = "false";
 
 // Note: the rest of the variables should be coming from the build server,
 // see `/deployment/cake/*-variables.cake` for customization options
@@ -31,8 +38,38 @@ Parameters["DeployCatelFodyAttributes"] = "true";
 Components.Add("Catel.Fody");
 Components.Add("Catel.Fody.Attributes");
 
-TestProjects.Add(string.Format("{0}.Tests.Catel5", GetBuildServerVariable("SolutionName")));
-//TestProjects.Add(string.Format("{0}.Tests.Catel6", GetBuildServerVariable("SolutionName")));
+// Components as dependencies since they are required by the test projects
+Dependencies.Add("Catel.Fody");
+Dependencies.Add("Catel.Fody.Attributes");
+
+Dependencies.Add("Catel.Fody.TestExternalTypesAssembly.Catel5", new []
+{
+    "Catel.Fody.Tests.Catel5"
+});
+Dependencies.Add("Catel.Fody.TestAssembly.NetStandard.Catel5", new []
+{
+    "Catel.Fody.Tests.Catel5"
+});
+Dependencies.Add("Catel.Fody.TestAssembly.Catel5", new []
+{
+    "Catel.Fody.Tests.Catel5"
+});
+
+Dependencies.Add("Catel.Fody.TestExternalTypesAssembly.Catel6", new []
+{
+    "Catel.Fody.Tests.Catel6"
+});
+Dependencies.Add("Catel.Fody.TestAssembly.Catel6", new []
+{
+    "Catel.Fody.Tests.Catel6"
+});
+
+// Test projects as dependencies since they don't following naming convention
+Dependencies.Add("Catel.Fody.Tests.Catel5");
+Dependencies.Add("Catel.Fody.Tests.Catel6");
+
+TestProjects.Add("Catel.Fody.Tests.Catel5");
+TestProjects.Add("Catel.Fody.Tests.Catel6");
 
 //=======================================================
 // REQUIRED INITIALIZATION, DO NOT CHANGE