Fix build

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "2.0.0",
+      "version": "4.1.0",
       "commands": [
         "dotnet-cake"
       ]

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 99designs
+Copyright (c) 2015 ByteNess
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,7 +4,7 @@
 [![GitHub latest release](https://img.shields.io/github/release/gusztavvargadr/aws-vault-chocolatey.svg)](https://github.com/gusztavvargadr/aws-vault-chocolatey/releases/latest/)
 [![Chocolatey downloads](https://img.shields.io/chocolatey/dt/aws-vault.svg)](https://chocolatey.org/packages/aws-vault/)
 
-This repository contains the source of the [Chocolatey package] for [AWS Vault] by [99designs].
+This repository contains the source of the [Chocolatey package] for [AWS Vault] by [ByteNess].
 
 ### Overview
 
@@ -15,5 +15,5 @@ This repository contains the source of the [Chocolatey package] for [AWS Vault]
 For more information please see [the original repository][AWS Vault].
 
 [Chocolatey package]: https://chocolatey.org/packages/aws-vault/
-[AWS Vault]: https://github.com/99designs/aws-vault/
-[99designs]: https://99designs.com/
+[AWS Vault]: https://github.com/ByteNess/aws-vault/
+[ByteNess]:  https://github.com/ByteNess/

azure-pipelines.yml

@@ -1,3 +1,9 @@
+parameters:
+  - name: release
+    displayName: Release
+    type: boolean
+    default: false
+
 trigger:
   branches:
     include:
@@ -6,8 +12,8 @@ pr: none
 
 variables:
   - group: pipeline
-  - name: branch
-    value: $[ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/tags/', '') ]
+  - name: isReleaseEnabled
+    value: ${{ parameters.release }}
 
 stages:
   - stage: commit
@@ -30,7 +36,7 @@ stages:
 
   - stage: release
     displayName: Release
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+    condition: eq(variables.isReleaseEnabled, true)
 
     variables:
       - group: stage-release

build.cake

@@ -3,15 +3,7 @@
 Task("Build")
   .IsDependentOn("Version")
   .Does(() => {
-    var settings = new DockerComposeRunSettings {
-      Entrypoint = "powershell -File ./build/docker/chef-client.cookbook.run.ps1",
-      Environment = new [] {
-        $"CHOCOLATEY_PROJECT_VERSION={projectVersion}",
-        $"CHOCOLATEY_PACKAGE_VERSION={packageVersion}"
-      }
-    };
-    var service = "chef-client";
-    DockerComposeRun(settings, service);
+    StartProcess("docker", $"compose run --env \"CHOCOLATEY_PROJECT_VERSION={projectVersion}\" --env \"CHOCOLATEY_PACKAGE_VERSION={packageVersion}\" --entrypoint \"powershell -File ./build/docker/chef-client.cookbook.run.ps1\" chef-client");
   });
 
 Task("Test")
@@ -44,11 +36,7 @@ Task("Test")
 Task("Package")
   .IsDependentOn("Test")
   .Does(() => {
-    var settings = new DockerComposeRunSettings {
-      Entrypoint = "powershell -File ./build/docker/chocolatey.package.pack.ps1",
-    };
-    var service = "chocolatey";
-    DockerComposeRun(settings, service);
+    StartProcess("docker", $"compose run --entrypoint \"powershell -File ./build/docker/chocolatey.package.pack.ps1\" chocolatey");
   });
 
 Task("Publish")

build/azp/azure-pipelines.build.yml

@@ -5,7 +5,7 @@ jobs:
     pool:
       name: Default
       demands:
-        - VSTS_AGENT_CAP_OS -equals windows
+        - Agent.OS -equals Windows_NT
 
     workspace:
       clean: all

build/azp/azure-pipelines.core.yml

@@ -2,10 +2,6 @@ steps:
   - checkout: self
     submodules: recursive
 
-  - script: |
-      git checkout $(branch)
-    displayName: Init Git
-
   - script: |
       dotnet --info
 

build/azp/azure-pipelines.deploy.yml

@@ -5,7 +5,7 @@ jobs:
     pool:
       name: Default
       demands:
-        - VSTS_AGENT_CAP_OS -equals windows
+        - Agent.OS -equals Windows_NT
 
     workspace:
       clean: all

build/cake/core.cake

@@ -1,12 +1,7 @@
-#addin nuget:?package=Cake.Docker&version=1.1.2
-#addin nuget:?package=Cake.SemVer&version=4.0.0
-#addin nuget:?package=semver&version=2.0.4
-
 var target = Argument("target", "Publish");
 var packageName = "aws-vault";
 
-var sourceVersion = Argument("source-version", "7.2.0");
-Semver.SemVersion sourceSemVer;
+var sourceVersion = Argument("source-version", "7.5.0");
 var buildVersion = Argument("build-version", string.Empty);
 var projectVersion = Argument("project-version", string.Empty);
 var packageVersion = Argument("package-version", string.Empty);
@@ -16,7 +11,7 @@ var chocolateyServer = EnvironmentVariable("CHOCOLATEY_SERVER", string.Empty);
 Task("Init")
   .Does(() => {
     StartProcess("docker", "--version");
-    StartProcess("docker-compose", "--version");
+    StartProcess("docker", "compose version");
 
     StartProcess("docker", "system df");
     StartProcess("docker", "container ls -a");
@@ -26,57 +21,22 @@ Task("Init")
 Task("Restore")
   .IsDependentOn("Init")
   .Does(() => {
-    var settings = new DockerComposeBuildSettings {
-    };
-    var services = new [] { "chef-client", "chocolatey" };
-    if (string.IsNullOrEmpty(sourceVersion)) {
-      services = (new [] { "gitversion" }).Concat(services).ToArray();
-    }
-    DockerComposeBuild(settings, services);
+    StartProcess("docker", "compose build chef-client chocolatey");
   });
 
 Task("Version")
   .IsDependentOn("Restore")
   .Does((context) => {
-    if (string.IsNullOrEmpty(sourceVersion)) {
-      {
-        var settings = new DockerComposeUpSettings {
-        };
-        var services = new [] { "gitversion" };
-        DockerComposeUp(settings, services);
-      }
-
-      {
-        var runner = new GenericDockerComposeRunner<DockerComposeLogsSettings>(
-          context.FileSystem,
-          context.Environment,
-          context.ProcessRunner,
-          context.Tools
-        );
-        var settings = new DockerComposeLogsSettings {
-          NoColor = true
-        };
-        var service = "gitversion";
-        var output = runner.RunWithResult(
-          "logs",
-          settings,
-          (items) => items.Where(item => item.Contains('|')).ToArray(),
-          service
-        ).Last();
-
-        sourceVersion = output.Split('|')[1].Trim();
-      }
-    }
     Information($"Source version: '{sourceVersion}'.");
-    sourceSemVer = ParseSemVer(sourceVersion);
 
     if (string.IsNullOrEmpty(buildVersion)) {
       buildVersion = $"{DateTimeOffset.UtcNow.ToUnixTimeSeconds()}";
     }
     Information($"Build version: '{buildVersion}'.");
 
-    if (string.IsNullOrEmpty(projectVersion)) {
-      projectVersion = new Semver.SemVersion(sourceSemVer.Major, sourceSemVer.Minor, sourceSemVer.Patch).ToString();
+    if (string.IsNullOrEmpty(projectVersion))
+    {
+      projectVersion = sourceVersion;
     }
     Information($"Project version: '{projectVersion}'.");
 
@@ -91,11 +51,7 @@ Task("Clean")
   .Does(() => {
     StartProcess("docker", "container prune -f");
 
-    var settings = new DockerComposeDownSettings {
-      Rmi = "local",
-      Volumes = true,
-    };
-    DockerComposeDown(settings);
+    StartProcess("docker", "compose down --rmi local --volumes");
 
     StartProcess("docker", "image prune -f");
     StartProcess("docker", "builder prune -af");

build/docker/chef-client.Dockerfile

@@ -1 +1 @@
-FROM gusztavvargadr/chef-client:latest
+FROM gusztavvargadr/chef-client:windows-servercore-ltsc2022

build/docker/chocolatey.Dockerfile

@@ -1,3 +1,3 @@
-FROM gusztavvargadr/chef-core:latest
+FROM gusztavvargadr/chef-core:windows-servercore-ltsc2022
 
 WORKDIR C:/opt/docker/work/

deploy.cake

@@ -8,14 +8,7 @@ Task("Build")
 Task("Test")
   .IsDependentOn("Build")
   .Does(() => {
-    {
-      var settings = new DockerComposeRunSettings {
-        Entrypoint = "powershell -File ./build/docker/chocolatey.package.install.ps1",
-      };
-      var service = "chocolatey";
-      var command = $"{packageVersion}";
-      DockerComposeRun(settings, service, command);
-    }
+    StartProcess("docker", $"compose run --entrypoint \"powershell -File ./build/docker/chocolatey.package.install.ps1\" chocolatey {packageVersion}");
   });
 
 Task("Package")
@@ -30,12 +23,7 @@ Task("Publish")
       return;
     }
 
-    var settings = new DockerComposeRunSettings {
-      Entrypoint = "powershell -File ./build/docker/chocolatey.package.push.ps1",
-    };
-    var service = "chocolatey";
-    var command = $"{packageVersion}";
-    DockerComposeRun(settings, service, command);
+    StartProcess("docker", $"compose run --entrypoint \"powershell -File ./build/docker/chocolatey.package.push.ps1\" chocolatey {packageVersion}");
   });
 
 RunTarget(target);

docker-compose.yml

@@ -1,16 +1,4 @@
-version: "3"
-
 services:
-  gitversion:
-    build:
-      context: ./build/docker/
-      dockerfile: ./gitversion.Dockerfile
-
-    volumes:
-      - ${REPO_DIR}:C:/opt/docker/work/
-
-    command: /showvariable NuGetVersionV2
-
   chef-client:
     build:
       context: ./build/docker/

src/chef/cookbooks/chocolatey-package/attributes/default.rb

@@ -1,7 +1,7 @@
 default['chocolatey-package'] = {
   'id' => 'aws-vault',
   'title' => 'AWS Vault',
-  'project-source-url' => 'https://github.com/99designs/aws-vault/',
+  'project-source-url' => 'https://github.com/ByteNess/aws-vault/',
   'project-version' => ENV['CHOCOLATEY_PROJECT_VERSION'],
   'package-source-url' => 'https://github.com/gusztavvargadr/aws-vault-chocolatey/',
   'package-version' => ENV['CHOCOLATEY_PACKAGE_VERSION'],

src/chef/cookbooks/chocolatey-package/recipes/default.rb

@@ -6,7 +6,7 @@
 package_version = node['chocolatey-package']['package-version']
 directory_path = "#{node['chocolatey-package']['directory-path']}#{id}/"
 
-project_download_url = "#{project_source_url}releases/download/v#{project_version}/#{id}-windows-386.exe"
+project_download_url = "#{project_source_url}releases/download/v#{project_version}/#{id}-windows-amd64.exe"
 project_download_path = "#{directory_path}tools/#{id}.exe"
 project_download_hash_md5 = ''
 project_download_hash_sha256 = ''

src/chef/cookbooks/chocolatey-package/templates/chocolatey-package.nuspec.erb

@@ -6,16 +6,16 @@
     <packageSourceUrl><%= @package_source_url %></packageSourceUrl>
     <owners>Gusztav Varga</owners>
     <title><%= @title %></title>
-    <authors>99designs</authors>
-    <projectUrl>https://99designs.com.au/tech-blog/blog/2015/10/26/aws-vault/</projectUrl>
-    <iconUrl>https://99designs.com/og-image.png</iconUrl>
-    <copyright>2015 99designs</copyright>
+    <authors>ByteNess</authors>
+    <projectUrl><%= @package_source_url %></projectUrl>
+    <iconUrl>https://avatars.githubusercontent.com/u/212586818</iconUrl>
+    <copyright>2015 ByteNess</copyright>
     <licenseUrl><%= @project_license_url %></licenseUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <projectSourceUrl><%= @project_source_url %></projectSourceUrl>
     <docsUrl><%= @project_source_url %>blob/v<%= @project_version %>/README.md</docsUrl>
     <bugTrackerUrl><%= @project_source_url %>issues/</bugTrackerUrl>
-    <tags>aws-vault 99designs aws</tags>
+    <tags>aws-vault ByteNess aws</tags>
     <summary>A tool to securely store and access AWS credentials in a development environment</summary>
     <description>
       AWS Vault is a tool to securely store and access AWS credentials in a development environment.

src/chef/cookbooks/chocolatey-package/templates/tools.LICENSE.txt.erb

@@ -5,7 +5,7 @@ LICENSE
 
 The MIT License (MIT)
 
-Copyright (c) 2015 99designs
+Copyright (c) 2015 ByteNess
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal