From 06c694a29d99e5b52f4420a372804510ac574cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <mamoreau@devolutions.net>
Date: Mon, 22 Jun 2026 08:43:17 -0400
Subject: [PATCH 1/2] Rename .NET policy model package

---
 policies/README.md                                        | 2 +-
 .../Devolutions.Now.Policy.Model.Tests.csproj}            | 4 ++--
 .../PolicyTests.cs                                        | 2 +-
 .../Devolutions.Now.Policy.Model.csproj}                  | 8 ++++----
 .../Enums.cs                                              | 2 +-
 .../PolicyJson.cs                                         | 2 +-
 .../PolicyModels.cs                                       | 2 +-
 policies/dotnet/Devolutions.Now.Policy.slnx               | 4 ++++
 policies/dotnet/Devolutions.NowPolicy.slnx                | 4 ----
 policies/dotnet/README.md                                 | 6 +++---
 10 files changed, 18 insertions(+), 18 deletions(-)
 rename policies/dotnet/{Devolutions.NowPolicy.Tests/Devolutions.NowPolicy.Tests.csproj => Devolutions.Now.Policy.Model.Tests/Devolutions.Now.Policy.Model.Tests.csproj} (76%)
 rename policies/dotnet/{Devolutions.NowPolicy.Tests => Devolutions.Now.Policy.Model.Tests}/PolicyTests.cs (99%)
 rename policies/dotnet/{Devolutions.NowPolicy/Devolutions.NowPolicy.csproj => Devolutions.Now.Policy.Model/Devolutions.Now.Policy.Model.csproj} (78%)
 rename policies/dotnet/{Devolutions.NowPolicy => Devolutions.Now.Policy.Model}/Enums.cs (96%)
 rename policies/dotnet/{Devolutions.NowPolicy => Devolutions.Now.Policy.Model}/PolicyJson.cs (92%)
 rename policies/dotnet/{Devolutions.NowPolicy => Devolutions.Now.Policy.Model}/PolicyModels.cs (99%)
 create mode 100644 policies/dotnet/Devolutions.Now.Policy.slnx
 delete mode 100644 policies/dotnet/Devolutions.NowPolicy.slnx

diff --git a/policies/README.md b/policies/README.md
index facee08..6bc9d39 100644
--- a/policies/README.md
+++ b/policies/README.md
@@ -3,4 +3,4 @@ Policies
 
 This directory contains Devolutions Agent NOW policy libraries.
 
-The .NET package is published as `Devolutions.NowPolicy`, and the Rust crate is published as `now-policy`.
\ No newline at end of file
+The .NET policy model package is published as `Devolutions.Now.Policy.Model`, and the Rust crate is published as `now-policy`.
\ No newline at end of file
diff --git a/policies/dotnet/Devolutions.NowPolicy.Tests/Devolutions.NowPolicy.Tests.csproj b/policies/dotnet/Devolutions.Now.Policy.Model.Tests/Devolutions.Now.Policy.Model.Tests.csproj
similarity index 76%
rename from policies/dotnet/Devolutions.NowPolicy.Tests/Devolutions.NowPolicy.Tests.csproj
rename to policies/dotnet/Devolutions.Now.Policy.Model.Tests/Devolutions.Now.Policy.Model.Tests.csproj
index e515722..2a9a63a 100644
--- a/policies/dotnet/Devolutions.NowPolicy.Tests/Devolutions.NowPolicy.Tests.csproj
+++ b/policies/dotnet/Devolutions.Now.Policy.Model.Tests/Devolutions.Now.Policy.Model.Tests.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
-    <RootNamespace>Devolutions.NowPolicy.Tests</RootNamespace>
+    <RootNamespace>Devolutions.Now.Policy.Model.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../Devolutions.NowPolicy/Devolutions.NowPolicy.csproj" />
+    <ProjectReference Include="../Devolutions.Now.Policy.Model/Devolutions.Now.Policy.Model.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/policies/dotnet/Devolutions.NowPolicy.Tests/PolicyTests.cs b/policies/dotnet/Devolutions.Now.Policy.Model.Tests/PolicyTests.cs
similarity index 99%
rename from policies/dotnet/Devolutions.NowPolicy.Tests/PolicyTests.cs
rename to policies/dotnet/Devolutions.Now.Policy.Model.Tests/PolicyTests.cs
index 19c6005..0e6d83d 100644
--- a/policies/dotnet/Devolutions.NowPolicy.Tests/PolicyTests.cs
+++ b/policies/dotnet/Devolutions.Now.Policy.Model.Tests/PolicyTests.cs
@@ -5,7 +5,7 @@
 
 using Xunit;
 
-namespace Devolutions.NowPolicy.Tests;
+namespace Devolutions.Now.Policy.Model.Tests;
 
 public class PolicyTests
 {
diff --git a/policies/dotnet/Devolutions.NowPolicy/Devolutions.NowPolicy.csproj b/policies/dotnet/Devolutions.Now.Policy.Model/Devolutions.Now.Policy.Model.csproj
similarity index 78%
rename from policies/dotnet/Devolutions.NowPolicy/Devolutions.NowPolicy.csproj
rename to policies/dotnet/Devolutions.Now.Policy.Model/Devolutions.Now.Policy.Model.csproj
index ba2a631..0ca7f36 100644
--- a/policies/dotnet/Devolutions.NowPolicy/Devolutions.NowPolicy.csproj
+++ b/policies/dotnet/Devolutions.Now.Policy.Model/Devolutions.Now.Policy.Model.csproj
@@ -4,16 +4,16 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <RootNamespace>Devolutions.NowPolicy</RootNamespace>
-    <AssemblyName>Devolutions.NowPolicy</AssemblyName>
+    <RootNamespace>Devolutions.Now.Policy.Model</RootNamespace>
+    <AssemblyName>Devolutions.Now.Policy.Model</AssemblyName>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackageId>Devolutions.NowPolicy</PackageId>
+    <PackageId>Devolutions.Now.Policy.Model</PackageId>
     <Version>0.0.0.0</Version>
     <AssemblyTitle>Devolutions NOW policy model</AssemblyTitle>
-    <Description>Policy creation and parsing APIs for Devolutions Agent NOW policy documents.</Description>
+    <Description>Policy document model, creation, and parsing APIs for Devolutions Agent NOW policies.</Description>
     <Authors>Devolutions Inc.</Authors>
     <Copyright>© Devolutions Inc. All rights reserved.</Copyright>
     <PackageLicenseExpression>MIT OR Apache-2.0</PackageLicenseExpression>
diff --git a/policies/dotnet/Devolutions.NowPolicy/Enums.cs b/policies/dotnet/Devolutions.Now.Policy.Model/Enums.cs
similarity index 96%
rename from policies/dotnet/Devolutions.NowPolicy/Enums.cs
rename to policies/dotnet/Devolutions.Now.Policy.Model/Enums.cs
index 0636ca3..f1a1fe3 100644
--- a/policies/dotnet/Devolutions.NowPolicy/Enums.cs
+++ b/policies/dotnet/Devolutions.Now.Policy.Model/Enums.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Devolutions.NowPolicy;
+namespace Devolutions.Now.Policy.Model;
 
 /// <summary>Package operation type.</summary>
 [JsonConverter(typeof(JsonStringEnumConverter<Operation>))]
diff --git a/policies/dotnet/Devolutions.NowPolicy/PolicyJson.cs b/policies/dotnet/Devolutions.Now.Policy.Model/PolicyJson.cs
similarity index 92%
rename from policies/dotnet/Devolutions.NowPolicy/PolicyJson.cs
rename to policies/dotnet/Devolutions.Now.Policy.Model/PolicyJson.cs
index 3d8b629..f8603a2 100644
--- a/policies/dotnet/Devolutions.NowPolicy/PolicyJson.cs
+++ b/policies/dotnet/Devolutions.Now.Policy.Model/PolicyJson.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Devolutions.NowPolicy;
+namespace Devolutions.Now.Policy.Model;
 
 public static class PolicyJson
 {
diff --git a/policies/dotnet/Devolutions.NowPolicy/PolicyModels.cs b/policies/dotnet/Devolutions.Now.Policy.Model/PolicyModels.cs
similarity index 99%
rename from policies/dotnet/Devolutions.NowPolicy/PolicyModels.cs
rename to policies/dotnet/Devolutions.Now.Policy.Model/PolicyModels.cs
index 8ec7a25..e5f2412 100644
--- a/policies/dotnet/Devolutions.NowPolicy/PolicyModels.cs
+++ b/policies/dotnet/Devolutions.Now.Policy.Model/PolicyModels.cs
@@ -6,7 +6,7 @@
 using YamlDotNet.Core;
 using YamlDotNet.RepresentationModel;
 
-namespace Devolutions.NowPolicy;
+namespace Devolutions.Now.Policy.Model;
 
 public static class SchemaUris
 {
diff --git a/policies/dotnet/Devolutions.Now.Policy.slnx b/policies/dotnet/Devolutions.Now.Policy.slnx
new file mode 100644
index 0000000..d01fb8d
--- /dev/null
+++ b/policies/dotnet/Devolutions.Now.Policy.slnx
@@ -0,0 +1,4 @@
+<Solution>
+  <Project Path="Devolutions.Now.Policy.Model.Tests/Devolutions.Now.Policy.Model.Tests.csproj"/>
+  <Project Path="Devolutions.Now.Policy.Model/Devolutions.Now.Policy.Model.csproj"/>
+</Solution>
diff --git a/policies/dotnet/Devolutions.NowPolicy.slnx b/policies/dotnet/Devolutions.NowPolicy.slnx
deleted file mode 100644
index 1207986..0000000
--- a/policies/dotnet/Devolutions.NowPolicy.slnx
+++ /dev/null
@@ -1,4 +0,0 @@
-<Solution>
-  <Project Path="Devolutions.NowPolicy.Tests/Devolutions.NowPolicy.Tests.csproj"/>
-  <Project Path="Devolutions.NowPolicy/Devolutions.NowPolicy.csproj"/>
-</Solution>
diff --git a/policies/dotnet/README.md b/policies/dotnet/README.md
index 9d60bf7..6dbce7a 100644
--- a/policies/dotnet/README.md
+++ b/policies/dotnet/README.md
@@ -1,4 +1,4 @@
-Devolutions NOW policy
-======================
+Devolutions NOW policy model
+============================
 
-This package provides .NET types and JSON/YAML parsing helpers for Devolutions Agent NOW policy documents.
+This package provides .NET policy document model types and JSON/YAML parsing helpers for Devolutions Agent NOW policies.

From 40b9fbd2e1ac31b68ffb2636cbd689fa8d591963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <mamoreau@devolutions.net>
Date: Mon, 22 Jun 2026 09:00:28 -0400
Subject: [PATCH 2/2] Update policy solution path in xtask

---
 xtask/src/dotnet.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xtask/src/dotnet.rs b/xtask/src/dotnet.rs
index 951c2da..5b973f8 100644
--- a/xtask/src/dotnet.rs
+++ b/xtask/src/dotnet.rs
@@ -17,8 +17,8 @@ const SOLUTIONS: &[DotnetSolution] = &[
         set_platform: true,
     },
     DotnetSolution {
-        path: "policies/dotnet/Devolutions.NowPolicy.slnx",
-        artifact_project: "policies/dotnet/Devolutions.NowPolicy",
+        path: "policies/dotnet/Devolutions.Now.Policy.slnx",
+        artifact_project: "policies/dotnet/Devolutions.Now.Policy.Model",
         set_platform: false,
     },
 ];