Merge pull request #24189 from veblush/win-build

Fix windows build failure due to winserver2016 upgrade
pull/24192/head
Esun Kim 5 years ago committed by GitHub
commit 4f0b8dfe56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/csharp/build_unitypackage.bat
  2. 2
      templates/src/csharp/build_unitypackage.bat.template
  3. 2
      test/distrib/csharp/run_distrib_test.bat
  4. 3
      tools/internal_ci/helper_scripts/prepare_build_windows.bat

@ -16,7 +16,7 @@
set VERSION=2.33.0-dev set VERSION=2.33.0-dev
@rem Adjust the location of nuget.exe @rem Adjust the location of nuget.exe
set NUGET=C:\nuget\nuget.exe set NUGET=nuget
set DOTNET=dotnet set DOTNET=dotnet
mkdir ..\..\artifacts mkdir ..\..\artifacts

@ -18,7 +18,7 @@
set VERSION=${settings.csharp_version} set VERSION=${settings.csharp_version}
@rem Adjust the location of nuget.exe @rem Adjust the location of nuget.exe
set NUGET=C:\nuget\nuget.exe set NUGET=nuget
set DOTNET=dotnet set DOTNET=dotnet
mkdir ..\..\artifacts mkdir ..\..\artifacts

@ -20,7 +20,7 @@ powershell -Command "Add-Type -Assembly 'System.IO.Compression.FileSystem'; [Sys
update_version.sh auto update_version.sh auto
set NUGET=C:\nuget\nuget.exe set NUGET=nuget
@rem TODO(jtattermusch): Get rid of this hack. See #8034 @rem TODO(jtattermusch): Get rid of this hack. See #8034
@rem We can't do just "nuget restore" because restoring a .sln solution doesn't work @rem We can't do just "nuget restore" because restoring a .sln solution doesn't work

@ -14,7 +14,8 @@
@rem make sure msys binaries are preferred over cygwin binaries @rem make sure msys binaries are preferred over cygwin binaries
@rem set path to python 2.7 @rem set path to python 2.7
set PATH=C:\tools\msys64\usr\bin;C:\Python27;%PATH% @rem set path to CMake
set PATH=C:\tools\msys64\usr\bin;C:\Python27;C:\Program Files\CMake\bin;%PATH%
@rem If this is a PR using RUN_TESTS_FLAGS var, then add flags to filter tests @rem If this is a PR using RUN_TESTS_FLAGS var, then add flags to filter tests
if defined KOKORO_GITHUB_PULL_REQUEST_NUMBER if defined RUN_TESTS_FLAGS ( if defined KOKORO_GITHUB_PULL_REQUEST_NUMBER if defined RUN_TESTS_FLAGS (

Loading…
Cancel
Save