Merge release/2.2.0

VirtoCommerce · Dec 28, 2021 · 9b4b08e · 9b4b08e
2 parents fb74656 + 93ae2f1
commit 9b4b08e
Show file tree

Hide file tree

Showing 252 changed files with 29,656 additions and 178 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,10 +35,9 @@ jobs:
           fetch-depth: 0
 
       - name: Install VirtoCommerce.GlobalTool
-        uses: VirtoCommerce/vc-github-actions/setup-vcbuild@master
-
-      - name: Install dotnet-sonarscanner
-        run: dotnet tool install --global dotnet-sonarscanner
+        run: |
+          dotnet pack
+          dotnet tool install -g VirtoCommerce.GlobalTool --add-source ./src/VirtoCommerce.Build/artifacts
 
       - name: Get changelog
         id: changelog

diff --git a/.gitignore b/.gitignore
@@ -352,3 +352,5 @@ MigrationBackup/
 
 # Artifacts directory
 artifacts/
+
+.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [2.2.0] - 2021-12-14
+### Added
+- Ability to install modules from Azure Pipeline Artifacts
+- Ability to install modules from Azure Universal Packages
+- Targets for build and publish Docker Images
+- Target for update specs of Argo Applications 
+### Changed
+- Target Framework updated to .net6
+### Fixed
+- Removing of temporary files after modules and platform installation
+- Minor fixes
+
 ## [2.1.0] - 2021-10-01
 ### Added
 - MatchVersions target

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,12 +1,12 @@
-<Project>
+<Project>
   <!-- These properties will be shared for all projects -->
 
   <PropertyGroup>
     <Product>VirtoCommerce</Product>
     <Copyright>Copyright © VirtoCommerce 2011-2021</Copyright>
   </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>2.1.0</VersionPrefix>
+    <VersionPrefix>2.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/PlatformTools/PackageManager.cs b/PlatformTools/PackageManager.cs
diff --git a/VirtoCommerce.Build.sln b/VirtoCommerce.Build.sln
@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "_build.csproj", "{826FB1DE-BF4F-4314-AA00-FC5BC7627D7F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtoCommerce.Build", "src\VirtoCommerce.Build\VirtoCommerce.Build.csproj", "{826FB1DE-BF4F-4314-AA00-FC5BC7627D7F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArgoCD.Client", "src\ArgoCD.Client\ArgoCD.Client.csproj", "{1895FCF7-C5E2-42BD-8559-9526B43B919D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,11 +17,17 @@ Global
 		{826FB1DE-BF4F-4314-AA00-FC5BC7627D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{826FB1DE-BF4F-4314-AA00-FC5BC7627D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{826FB1DE-BF4F-4314-AA00-FC5BC7627D7F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1895FCF7-C5E2-42BD-8559-9526B43B919D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1895FCF7-C5E2-42BD-8559-9526B43B919D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1895FCF7-C5E2-42BD-8559-9526B43B919D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1895FCF7-C5E2-42BD-8559-9526B43B919D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {963A3769-831D-4063-97CC-89CAAA64A14A}
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+	EndGlobalSection
 EndGlobal
diff --git a/docs/targets.md b/docs/targets.md
@@ -170,3 +170,43 @@ Removes .tmp directory
 vc-build ClearTemp 
 ```
 :::
+:::
+## DockerLogin
+Executes "docker login"
+Gets parameters: DockerRegistryUrl, DockerUsername, DockerPassword
+```console
+vc-build dockerlogin -DockerRegistryUrl https://myregistry.com -DockerUsername user -DockerPassword 12345
+```
+:::
+:::
+## BuildImage
+Builds docker image
+Gets parameters: DockerfilePath, DockerImageFullName
+```console
+vc-build buildimage -DockerfilePath ./dockerfile -DockerImageFullName myimage:dev
+```
+:::
+:::
+## PushImage
+Pushes docker image to the remote registry
+Gets parameters: DockerImageFullName
+```console
+vc-build PushImage -DockerImageFullName myimage:dev
+```
+:::
+:::
+## BuildAndPush
+Builds and pushes docker image
+Gets parameters: DockerRegistryUrl, DockerUsername, DockerPassword, DockerfilePath, DockerImageFullName
+```console
+vc-build BuildAndPush -DockerRegistryUrl https://myregistry.com -DockerUsername user -DockerPassword 12345 -DockerfilePath ./dockerfile -DockerImageFullName myimage:dev
+```
+:::
+:::
+## ArgoUpdateApplication
+Updates Applications in ArgoCD
+Gets parameters: ArgoServer, ArgoToken(or as an alternative - ARGO_TOKEN environment variable), ArgoConfigFile
+```console
+vc-build ArgoUpdateApplication -ArgoConfigFile ./environments.yml -ArgoServer https://argoserver.com
+```
+:::
diff --git a/src/.DS_Store b/src/.DS_Store
Original file line number	Diff line number	Diff line change
Expand Up		@@ -352,3 +352,5 @@ MigrationBackup/

		# Artifacts directory
		artifacts/

		.DS_Store