Merge branch 'develop' into main

Daniel127 · Nov 20, 2021 · 8dd645a · 8dd645a
2 parents ccddd37 + 78a86dc
commit 8dd645a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/.azure/workflows/azure-ci-development.yml b/.azure/workflows/azure-ci-development.yml
@@ -3,7 +3,7 @@ trigger:
 - release/*
 
 pr:
-- master
+- main
 - develop
 
 pool:

diff --git a/.azure/workflows/azure-ci-release.yml b/.azure/workflows/azure-ci-release.yml
@@ -1,5 +1,5 @@
 trigger:
-- master
+- main
 
 # no PR builds
 pr: none
@@ -12,11 +12,11 @@ variables:
 
 steps:
 
-- task: ShellScript@2
-  displayName: 'Configure variables'
-  inputs:
-    scriptPath: '.azure/workflows/configure-variables-release.sh'
-    failOnStandardError: true
+# - task: ShellScript@2
+#   displayName: 'Configure variables'
+#   inputs:
+#     scriptPath: '.azure/workflows/configure-variables-release.sh'
+#     failOnStandardError: true
 
 # Install .NET Core SDK
 - task: UseDotNet@2
@@ -81,18 +81,18 @@ steps:
   inputs:
     pollingTimeoutSec: '300'
 
-- task: DotNetCoreCLI@2
-  displayName: 'Create Nuget packages'
-  inputs:
-    command: 'pack'
-    packagesToPack: '**/*.csproj'
-    configuration: '$(buildConfiguration)'
-    packDirectory: '$(Pipeline.Workspace)/nuget'
-    nobuild: true
-    versioningScheme: 'off'
+# - task: DotNetCoreCLI@2
+#   displayName: 'Create Nuget packages'
+#   inputs:
+#     command: 'pack'
+#     packagesToPack: '**/*.csproj'
+#     configuration: '$(buildConfiguration)'
+#     packDirectory: '$(Pipeline.Workspace)/nuget'
+#     nobuild: true
+#     versioningScheme: 'off'
 
-- task: PublishPipelineArtifact@1
-  displayName: 'Publish artifact'
-  inputs:
-    targetPath: '$(Pipeline.Workspace)/nuget'
-    artifact: 'Package'
+# - task: PublishPipelineArtifact@1
+#   displayName: 'Publish artifact'
+#   inputs:
+#     targetPath: '$(Pipeline.Workspace)/nuget'
+#     artifact: 'Package'