diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 000000000..5d13a61f2
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,57 @@
+version: 1.0.{build}
+image: Visual Studio 2019
+configuration: Release
+platform: x64
+clone_folder: '%USERPROFILE%\go\src\github.com\pulumi\pulumi'
+branches:
+  only:
+    - master
+    - /v\d*\.\d*\.\d*/
+environment:
+  PULUMI_API: https://api.pulumi-staging.io
+  PULUMI_ACCESS_TOKEN:
+    secure: +c7s1GgUunQl8QlLZs7zafFv6lJbZp40fx1kJl7v+n0qa8oq3ssBlVEl9gfoMBgH
+  AWS_ACCESS_KEY_ID:
+    secure: eB7Gfl1GHhz60tH2EEASI7IFsWHDd5SV+kponXwaCSo=
+  AWS_SECRET_ACCESS_KEY:
+    secure: T19RJk7Uv3trAChRRDB82OAUDI8k2q9PaSetU7yDFu4aC+MshdwAhTTN/TaPkwl/
+  AWS_REGION: us-west-2
+  ARM_LOCATION: "West US 2"
+  ARM_ENVIRONMENT: public
+  matrix:
+    - nodejs_version: "10.15.3"
+init:
+  - ps: Install-Product node $env:nodejs_version x64
+install:
+  - rmdir C:\go /s /q
+  - appveyor DownloadFile https://dl.google.com/go/go1.13.4.windows-amd64.zip
+  - 7z x go1.13.4.windows-amd64.zip -y -oC:\ > NUL
+  - cmd: >-
+      set GOPATH=%USERPROFILE%\go
+      set PATH=C:\go\bin;%PATH%;%GOPATH%\bin
+      set PATH=%PATH%;%USERPROFILE%\.yarn\bin
+      set PulumiRoot=C:\Pulumi
+      set PATH=%PulumiRoot%\bin;%PATH%
+      go version
+      git clone https://github.com/pulumi/scripts.git "%USERPROFILE%\go\src\github.com\pulumi\scripts"
+      set PATH=%PATH%;C:\Python37-x64\Scripts
+      pip3 install pyenv-win --target %USERPROFILE%/.pyenv
+      set PYENV=%USERPROFILE%\.pyenv\pyenv-win
+      set PATH=%PATH%;%PYENV%\bin;%PYENV%\shims
+      pip3 install pipenv
+
+      set PULUMI_LOCAL_NUGET=C:\Pulumi\nuget
+
+      set PULUMI_TEST_OWNER=moolumi
+      choco install dep
+  - ps: >-
+      New-Item -Type Directory "$env:USERPROFILE\go\bin"
+build_script:
+  - cmd: >-
+      set GO111MODULE=on
+      pushd . && cd sdk && go mod tidy && go mod download && popd
+      pushd . && cd pkg && go mod tidy && go mod download && popd
+      pushd . && cd examples && go mod tidy && go mod download && popd
+      pushd . && cd tests && go mod tidy && go mod download && popd
+      if defined APPVEYOR_REPO_TAG_NAME ( dotnet msbuild /t:ReleaseProcess /v:Detailed build.proj )
+test: off
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index 0e39912ef..dba2509f9 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -4,7 +4,6 @@ on:
       - master
       - 'feature-.*'
       - 'features/.*'
-    tags:
 
 jobs:
   build: