microsoft · jamespik · Oct 26, 2021 · Oct 25, 2021 · Oct 25, 2021 · Oct 25, 2021
diff --git a/pipelines/templates/copy-and-publish-powershell.yml b/pipelines/templates/copy-and-publish-powershell.yml
@@ -0,0 +1,27 @@
+# Template helper to copy powershell dependency files and publish them as an artifact
+parameters:
+  name: ''
+  source: '' 
+  TargetPlatform: ''
+
+steps:
+- task: CopyFiles@2
+  displayName: 'Copy Files: ${{ parameters.name }}'
+  inputs:
+    Contents: |
+     ${{ parameters.source }}\Microsoft.Extensions.Logging.Abstractions.dll
+     ${{ parameters.source }}\Microsoft.WinGet.PowershellSupport.dll
+     ${{ parameters.source }}\Microsoft.WinGet.RestSource.Util.dll
+     ${{ parameters.source }}\Newtonsoft.Json.dll
+     ${{ parameters.source }}\System.ComponentModel.Annotations.dll
+     ${{ parameters.source }}\YamlDotNet.dll
+     ${{ parameters.source }}\runtimes\win-${{TargetPlatform}}\native\WinGetUtil.dll
+    TargetFolder:  '$(build.artifactstagingdirectory)\${{ parameters.name }}'
+    CleanTargetFolder: true
+    OverWrite: true
+
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish Artifact: WinGet.RestSource-${{ parameters.name }}'
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)\${{ parameters.name }}'
+    ArtifactName: 'WinGet.RestSource-${{ parameters.name }}'
diff --git a/pipelines/templates/restore-build-publish-test.yml b/pipelines/templates/restore-build-publish-test.yml
@@ -1,51 +1,64 @@
-# Template helper to restore, build, and publish
-
-steps:
-## Restore
-- task: DotNetCoreCLI@2
-  displayName: 'Restore'
-  inputs:
-    command: 'restore'
-    projects: '**/*.csproj'
-    feedsToUse: 'config'
-    nugetConfigPath: '$(Build.SourcesDirectory)\src\NuGEt.config'
-    restoreDirectory: '$(Build.SourcesDirectory)\src\packages'
-
-## Build
-- task: VSBuild@1
-  displayName: Build
-  inputs:
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    clean: true
-
-## Publish
-# Publish ARM Templates
-- template: copy-and-publish.yml
-  parameters:
-    name: WinGet.Restsource.Infrastructure
-    source: '$(Build.SourcesDirectory)\src\WinGet.RestSource.Infrastructure\bin\$(BuildConfiguration)'
-
-# Publish Rest Function App
-- template: package-and-publish.yml
-  parameters:
-    name: WinGet.RestSource.Functions
-    projects: '$(Build.SourcesDirectory)\src\WinGet.RestSource.Functions\WinGet.RestSource.Functions.csproj'
-    buildconfig: '$(BuildConfiguration)'
-    zipAfterPublish: True
-
-## Run Unit Tests
-- template: run-unittests.yml
-  parameters:
-    name: WinGet.RestSource.UnitTest
-    source: '$(Build.SourcesDirectory)\src\WinGet.RestSource.UnitTest\bin\$(BuildConfiguration)\netcoreapp3.1'
-    dll: Microsoft.WinGet.RestSource.UnitTest.dll
-
-## Component Governance
-- task: ComponentGovernanceComponentDetection@0
-  displayName: Component Governance
-  inputs:
-    scanType: 'Register'
-    verbosity: 'Verbose'
-    alertWarningLevel: 'High'
+# Template helper to restore, build, and publish
+
+steps:
+## Restore
+- task: DotNetCoreCLI@2
+  displayName: 'Restore'
+  inputs:
+    command: 'restore'
+    projects: '**/*.csproj'
+    feedsToUse: 'config'
+    nugetConfigPath: '$(Build.SourcesDirectory)\src\NuGEt.config'
+    restoreDirectory: '$(Build.SourcesDirectory)\src\packages'
+
+## Build
+- task: VSBuild@1
+  displayName: Build
+  inputs:
+    platform: '$(BuildPlatform)'
+    configuration: '$(BuildConfiguration)'
+    clean: true
+
+## Publish
+# Publish ARM Templates
+- template: copy-and-publish.yml
+  parameters:
+    name: WinGet.Restsource.Infrastructure
+    source: '$(Build.SourcesDirectory)\src\WinGet.RestSource.Infrastructure\bin\$(BuildConfiguration)'
+
+# Publish Rest Function App
+- template: package-and-publish.yml
+  parameters:
+    name: WinGet.RestSource.Functions
+    projects: '$(Build.SourcesDirectory)\src\WinGet.RestSource.Functions\WinGet.RestSource.Functions.csproj'
+    buildconfig: '$(BuildConfiguration)'
+    zipAfterPublish: True
+
+# Publish x86 powershell binaries
+- template: copy-and-publish-powershell.yml
+  parameters:
+    name: WinGet.Restsource.x86PowershellSupport
+    source: '$(Build.SourcesDirectory)\src\WinGet.RestSource.PowershellSupport\bin\$(BuildConfiguration)\netstandard2.0'
+    BuildPlatform: 'x86'
+
+- template: copy-and-publish-powershell.yml
+  parameters:
+    name: WinGet.Restsource.x64PowershellSupport
+    source: '$(Build.SourcesDirectory)\src\WinGet.RestSource.PowershellSupport\bin\$(BuildConfiguration)\netstandard2.0'
+    BuildPlatform: 'x64'
+
+## Run Unit Tests
+- template: run-unittests.yml
+  parameters:
+    name: WinGet.RestSource.UnitTest
+    source: '$(Build.SourcesDirectory)\src\WinGet.RestSource.UnitTest\bin\$(BuildConfiguration)\netcoreapp3.1'
+    dll: Microsoft.WinGet.RestSource.UnitTest.dll
+
+## Component Governance
+- task: ComponentGovernanceComponentDetection@0
+  displayName: Component Governance
+  inputs:
+    scanType: 'Register'
+    verbosity: 'Verbose'
+    alertWarningLevel: 'High'
     failOnAlert: true
diff --git a/src/NuGet.config b/src/NuGet.config
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="winget" value="https://pkgs.dev.azure.com/ms/winget-cli-restsource/_packaging/winget/nuget/v3/index.json" />
-  </packageSources>
-  <packageRestore>
-    <add key="enabled" value="True" />
-    <add key="automatic" value="True" />
-  </packageRestore>
-  <bindingRedirects>
-    <add key="skip" value="False" />
-  </bindingRedirects>
-  <packageManagement>
-    <add key="format" value="1" />
-    <add key="disabled" value="False" />
-  </packageManagement>
-  <config>
-    <add key="dependencyversion" value="Highest" />
-    <add key="globalPackagesFolder" value="packages" />
-  </config>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="winget" value="https://pkgs.dev.azure.com/ms/winget-cli-restsource/_packaging/winget/nuget/v3/index.json" />
+  </packageSources>
+  <packageRestore>
+    <add key="enabled" value="True" />
+    <add key="automatic" value="True" />
+  </packageRestore>
+  <bindingRedirects>
+    <add key="skip" value="False" />
+  </bindingRedirects>
+  <packageManagement>
+    <add key="format" value="1" />
+    <add key="disabled" value="False" />
+  </packageManagement>
+  <config>
+    <add key="dependencyversion" value="Highest" />
+    <add key="globalPackagesFolder" value="packages" />
+  </config>
 </configuration>
diff --git a/src/WinGet.RestSource.Functions/Common/ActionResultHelper.cs b/src/WinGet.RestSource.Functions/Common/ActionResultHelper.cs
@@ -8,8 +8,8 @@ namespace Microsoft.WinGet.RestSource.Functions.Common
 {
     using System;
     using System.Net;
-    using Microsoft.WinGet.RestSource.Constants;
-    using Microsoft.WinGet.RestSource.Models.Errors;
+    using Microsoft.WinGet.RestSource.Utils.Constants;
+    using Microsoft.WinGet.RestSource.Utils.Models.Errors;
 
     /// <summary>
     /// This Creates Action Results.

diff --git a/src/WinGet.RestSource.Functions/InstallerFunctions.cs b/src/WinGet.RestSource.Functions/InstallerFunctions.cs
@@ -15,14 +15,14 @@ namespace Microsoft.WinGet.RestSource.Functions
     using Microsoft.Azure.WebJobs;
     using Microsoft.Azure.WebJobs.Extensions.Http;
     using Microsoft.Extensions.Logging;
-    using Microsoft.WinGet.RestSource.Common;
-    using Microsoft.WinGet.RestSource.Constants;
-    using Microsoft.WinGet.RestSource.Exceptions;
     using Microsoft.WinGet.RestSource.Functions.Common;
-    using Microsoft.WinGet.RestSource.Models;
-    using Microsoft.WinGet.RestSource.Models.Errors;
-    using Microsoft.WinGet.RestSource.Models.Schemas;
-    using Microsoft.WinGet.RestSource.Validators;
+    using Microsoft.WinGet.RestSource.Utils.Common;
+    using Microsoft.WinGet.RestSource.Utils.Constants;
+    using Microsoft.WinGet.RestSource.Utils.Exceptions;
+    using Microsoft.WinGet.RestSource.Utils.Models;
+    using Microsoft.WinGet.RestSource.Utils.Models.Errors;
+    using Microsoft.WinGet.RestSource.Utils.Models.Schemas;
+    using Microsoft.WinGet.RestSource.Utils.Validators;
 
     /// <summary>
     /// This class contains the functions for interacting with installers.

diff --git a/src/WinGet.RestSource.Functions/LocaleFunctions.cs b/src/WinGet.RestSource.Functions/LocaleFunctions.cs
@@ -15,14 +15,14 @@ namespace Microsoft.WinGet.RestSource.Functions
     using Microsoft.Azure.WebJobs;
     using Microsoft.Azure.WebJobs.Extensions.Http;
     using Microsoft.Extensions.Logging;
-    using Microsoft.WinGet.RestSource.Common;
-    using Microsoft.WinGet.RestSource.Constants;
-    using Microsoft.WinGet.RestSource.Exceptions;
     using Microsoft.WinGet.RestSource.Functions.Common;
-    using Microsoft.WinGet.RestSource.Models;
-    using Microsoft.WinGet.RestSource.Models.Errors;
-    using Microsoft.WinGet.RestSource.Models.Schemas;
-    using Microsoft.WinGet.RestSource.Validators;
+    using Microsoft.WinGet.RestSource.Utils.Common;
+    using Microsoft.WinGet.RestSource.Utils.Constants;
+    using Microsoft.WinGet.RestSource.Utils.Exceptions;
+    using Microsoft.WinGet.RestSource.Utils.Models;
+    using Microsoft.WinGet.RestSource.Utils.Models.Errors;
+    using Microsoft.WinGet.RestSource.Utils.Models.Schemas;
+    using Microsoft.WinGet.RestSource.Utils.Validators;
 
     /// <summary>
     /// This class contains the functions for interacting with locales.

diff --git a/src/WinGet.RestSource.Functions/ManifestSearchFunctions.cs b/src/WinGet.RestSource.Functions/ManifestSearchFunctions.cs
@@ -15,14 +15,14 @@ namespace Microsoft.WinGet.RestSource.Functions
     using Microsoft.Azure.WebJobs;
     using Microsoft.Azure.WebJobs.Extensions.Http;
     using Microsoft.Extensions.Logging;
-    using Microsoft.WinGet.RestSource.Common;
-    using Microsoft.WinGet.RestSource.Constants;
-    using Microsoft.WinGet.RestSource.Exceptions;
     using Microsoft.WinGet.RestSource.Functions.Common;
-    using Microsoft.WinGet.RestSource.Models;
-    using Microsoft.WinGet.RestSource.Models.Arrays;
-    using Microsoft.WinGet.RestSource.Models.Schemas;
-    using Microsoft.WinGet.RestSource.Validators;
+    using Microsoft.WinGet.RestSource.Utils.Common;
+    using Microsoft.WinGet.RestSource.Utils.Constants;
+    using Microsoft.WinGet.RestSource.Utils.Exceptions;
+    using Microsoft.WinGet.RestSource.Utils.Models;
+    using Microsoft.WinGet.RestSource.Utils.Models.Arrays;
+    using Microsoft.WinGet.RestSource.Utils.Models.Schemas;
+    using Microsoft.WinGet.RestSource.Utils.Validators;
 
     /// <summary>
     /// This class contains the functions for searching manifests.

diff --git a/src/WinGet.RestSource.Functions/PackageFunctions.cs b/src/WinGet.RestSource.Functions/PackageFunctions.cs
@@ -16,14 +16,14 @@ namespace Microsoft.WinGet.RestSource.Functions
     using Microsoft.Azure.WebJobs.Extensions.Http;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Primitives;
-    using Microsoft.WinGet.RestSource.Common;
-    using Microsoft.WinGet.RestSource.Constants;
-    using Microsoft.WinGet.RestSource.Exceptions;
     using Microsoft.WinGet.RestSource.Functions.Common;
-    using Microsoft.WinGet.RestSource.Models;
-    using Microsoft.WinGet.RestSource.Models.Errors;
-    using Microsoft.WinGet.RestSource.Models.Schemas;
-    using Microsoft.WinGet.RestSource.Validators;
+    using Microsoft.WinGet.RestSource.Utils.Common;
+    using Microsoft.WinGet.RestSource.Utils.Constants;
+    using Microsoft.WinGet.RestSource.Utils.Exceptions;
+    using Microsoft.WinGet.RestSource.Utils.Models;
+    using Microsoft.WinGet.RestSource.Utils.Models.Errors;
+    using Microsoft.WinGet.RestSource.Utils.Models.Schemas;
+    using Microsoft.WinGet.RestSource.Utils.Validators;
 
     /// <summary>
     /// This class contains the functions for interacting with packages.

diff --git a/src/WinGet.RestSource.Functions/PackageManifestFunctions.cs b/src/WinGet.RestSource.Functions/PackageManifestFunctions.cs
@@ -15,15 +15,15 @@ namespace Microsoft.WinGet.RestSource.Functions
     using Microsoft.Azure.WebJobs;
     using Microsoft.Azure.WebJobs.Extensions.Http;
     using Microsoft.Extensions.Logging;
-    using Microsoft.WinGet.RestSource.Common;
-    using Microsoft.WinGet.RestSource.Constants;
-    using Microsoft.WinGet.RestSource.Exceptions;
     using Microsoft.WinGet.RestSource.Functions.Common;
-    using Microsoft.WinGet.RestSource.Models;
-    using Microsoft.WinGet.RestSource.Models.Arrays;
-    using Microsoft.WinGet.RestSource.Models.Errors;
-    using Microsoft.WinGet.RestSource.Models.Schemas;
-    using Microsoft.WinGet.RestSource.Validators;
+    using Microsoft.WinGet.RestSource.Utils.Common;
+    using Microsoft.WinGet.RestSource.Utils.Constants;
+    using Microsoft.WinGet.RestSource.Utils.Exceptions;
+    using Microsoft.WinGet.RestSource.Utils.Models;
+    using Microsoft.WinGet.RestSource.Utils.Models.Arrays;
+    using Microsoft.WinGet.RestSource.Utils.Models.Errors;
+    using Microsoft.WinGet.RestSource.Utils.Models.Schemas;
+    using Microsoft.WinGet.RestSource.Utils.Validators;
 
     /// <summary>
     /// This class contains the functions for interacting with manifests.

diff --git a/src/WinGet.RestSource.Functions/ServerFunctions.cs b/src/WinGet.RestSource.Functions/ServerFunctions.cs
@@ -12,11 +12,12 @@ namespace Microsoft.WinGet.RestSource.Functions
     using Microsoft.Azure.WebJobs;
     using Microsoft.Azure.WebJobs.Extensions.Http;
     using Microsoft.Extensions.Logging;
-    using Microsoft.WinGet.RestSource.Constants;
-    using Microsoft.WinGet.RestSource.Exceptions;
+    using Microsoft.WinGet.RestSource.Cosmos;
     using Microsoft.WinGet.RestSource.Functions.Common;
-    using Microsoft.WinGet.RestSource.Models;
-    using Microsoft.WinGet.RestSource.Models.Schemas;
+    using Microsoft.WinGet.RestSource.Utils.Constants;
+    using Microsoft.WinGet.RestSource.Utils.Exceptions;
+    using Microsoft.WinGet.RestSource.Utils.Models;
+    using Microsoft.WinGet.RestSource.Utils.Models.Schemas;
 
     /// <summary>
     /// This class contains the functions for interacting with packages.

diff --git a/src/WinGet.RestSource.Functions/Startup.cs b/src/WinGet.RestSource.Functions/Startup.cs
@@ -15,9 +15,9 @@ namespace Microsoft.WinGet.RestSource.Functions
     using Microsoft.Azure.Functions.Extensions.DependencyInjection;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Logging;
-    using Microsoft.WinGet.RestSource.Common;
-    using Microsoft.WinGet.RestSource.Constants;
     using Microsoft.WinGet.RestSource.Cosmos;
+    using Microsoft.WinGet.RestSource.Utils.Common;
+    using Microsoft.WinGet.RestSource.Utils.Constants;
 
     /// <summary>
     /// Azure function startup class.

diff --git a/src/WinGet.RestSource.Functions/VersionFunctions.cs b/src/WinGet.RestSource.Functions/VersionFunctions.cs
@@ -15,14 +15,14 @@ namespace Microsoft.WinGet.RestSource.Functions
     using Microsoft.Azure.WebJobs;
     using Microsoft.Azure.WebJobs.Extensions.Http;
     using Microsoft.Extensions.Logging;
-    using Microsoft.WinGet.RestSource.Common;
-    using Microsoft.WinGet.RestSource.Constants;
-    using Microsoft.WinGet.RestSource.Exceptions;
     using Microsoft.WinGet.RestSource.Functions.Common;
-    using Microsoft.WinGet.RestSource.Models;
-    using Microsoft.WinGet.RestSource.Models.Errors;
-    using Microsoft.WinGet.RestSource.Validators;
-    using Version = Microsoft.WinGet.RestSource.Models.Schemas.Version;
+    using Microsoft.WinGet.RestSource.Utils.Common;
+    using Microsoft.WinGet.RestSource.Utils.Constants;
+    using Microsoft.WinGet.RestSource.Utils.Exceptions;
+    using Microsoft.WinGet.RestSource.Utils.Models;
+    using Microsoft.WinGet.RestSource.Utils.Models.Errors;
+    using Microsoft.WinGet.RestSource.Utils.Validators;
+    using Version = Microsoft.WinGet.RestSource.Utils.Models.Schemas.Version;
 
     /// <summary>
     /// This class contains the functions for interacting with versions.