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 @@ enable enable false - Devolutions.NowPolicy.Tests + Devolutions.Now.Policy.Model.Tests @@ -16,7 +16,7 @@ - + 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 @@ latest enable enable - Devolutions.NowPolicy - Devolutions.NowPolicy + Devolutions.Now.Policy.Model + Devolutions.Now.Policy.Model true - Devolutions.NowPolicy + Devolutions.Now.Policy.Model 0.0.0.0 Devolutions NOW policy model - Policy creation and parsing APIs for Devolutions Agent NOW policy documents. + Policy document model, creation, and parsing APIs for Devolutions Agent NOW policies. Devolutions Inc. © Devolutions Inc. All rights reserved. MIT OR Apache-2.0 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; /// Package operation type. [JsonConverter(typeof(JsonStringEnumConverter))] 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 @@ + + + + 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 @@ - - - - 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. 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, }, ];