Merge branch 'main' into release/1.0

.github/workflows/release_ci.yml

@@ -63,7 +63,7 @@ jobs:
         VERSION="${arrTag[2]}"
         VERSION="${VERSION//v}"
         dotnet pack -c Release --no-restore --no-build -p:Version=$VERSION -p:TreatWarningsAsErrors=false
-        dotnet nuget push './src/**/*.nupkg' -k ${{secrets.CLOUDSMITH_API_KEY}} -n true -s https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json --skip-duplicate
+        dotnet nuget push './src/**/*.nupkg' -k ${{secrets.NUGET_API_KEY}} -n true -s https://api.nuget.org/v3/index.json --skip-duplicate
     - name: Login to DockerHub
       if: matrix.os == 'ubuntu-latest'
       uses: docker/login-action@v1
@@ -77,8 +77,8 @@ jobs:
         rm -rf ./src/OrchardCore.Cms.Web/App_Data_Tests
         dotnet publish -c Release -o ./.build/release --no-build --no-restore --framework net5.0
         docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-linux:latest .
-        # docker push orchardproject/orchardcore-cms-linux:latest 
-        # docker push "orchardproject/orchardcore-cms-linux:$VERSION"
+        docker push orchardproject/orchardcore-cms-linux:latest 
+        docker push "orchardproject/orchardcore-cms-linux:$VERSION"
     - name: Deploy preview docker image for windows
       if: matrix.os == 'windows-latest'
       run: |
@@ -87,8 +87,8 @@ jobs:
         dotnet publish -c Release -o ./.build/release --no-build --no-restore --framework net5.0
         docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-windows:latest .
         echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u="${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-        # docker push orchardproject/orchardcore-cms-windows:latest 
-        # docker push "orchardproject/orchardcore-cms-windows:$VERSION"
+        docker push orchardproject/orchardcore-cms-windows:latest 
+        docker push "orchardproject/orchardcore-cms-windows:$VERSION"
 
 # TODO: 
 # use NuGet