Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion policies/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
The .NET policy model package is published as `Devolutions.Now.Policy.Model`, and the Rust crate is published as `now-policy`.
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using Xunit;

namespace Devolutions.NowPolicy.Tests;
namespace Devolutions.Now.Policy.Model.Tests;

public class PolicyTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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>))]
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using YamlDotNet.Core;
using YamlDotNet.RepresentationModel;

namespace Devolutions.NowPolicy;
namespace Devolutions.Now.Policy.Model;

public static class SchemaUris
{
Expand Down
4 changes: 4 additions & 0 deletions policies/dotnet/Devolutions.Now.Policy.slnx
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 0 additions & 4 deletions policies/dotnet/Devolutions.NowPolicy.slnx

This file was deleted.

6 changes: 3 additions & 3 deletions policies/dotnet/README.md
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions xtask/src/dotnet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
];
Expand Down
Loading