Update common build scripts

emgarten · Nov 11, 2018 · 544c788 · 544c788
1 parent 9eb1829
commit 544c788
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/build/common/common.ps1 b/build/common/common.ps1
@@ -20,9 +20,9 @@ Function Install-DotnetCLI {
 
         Write-Host "Fetching $installDotnet"
 
-        wget https://raw.githubusercontent.com/dotnet/cli/62ce305f06c502a2fae459fc906c982b943c6128/scripts/obtain/dotnet-install.ps1 -OutFile $installDotnet
+        wget https://raw.githubusercontent.com/dotnet/cli/b3b69e36cb7b99a1b42dceb3a0167d283f653575/scripts/obtain/dotnet-install.ps1 -OutFile $installDotnet
 
-        & $installDotnet -i $CLIRoot -Version 2.1.300
+        & $installDotnet -Channel 2.1 -i $CLIRoot -Version 2.1.403
         & $installDotnet -Channel 2.0 -i $CLIRoot -Version 2.0.3
         & $installDotnet -Channel preview -i $CLIRoot -Version 1.0.4
 

diff --git a/build/common/common.sh b/build/common/common.sh
@@ -11,11 +11,11 @@ run_standard_tests()
   if [ ! -f $DOTNET ]; then
     echo "Installing dotnet"
     mkdir -p .cli
-    curl -o .cli/dotnet-install.sh https://raw.githubusercontent.com/dotnet/cli/485638376d20426a382705b9c546b47bea0da206/scripts/obtain/dotnet-install.sh
+    curl -o .cli/dotnet-install.sh https://raw.githubusercontent.com/dotnet/cli/99ff2dbb524679a14e74ba22e42210b2b009ee80/scripts/obtain/dotnet-install.sh
 
     # Run install.sh
     chmod +x .cli/dotnet-install.sh
-    .cli/dotnet-install.sh -i .cli -v 2.1.300
+    .cli/dotnet-install.sh -i .cli -c 2.1 -v 2.1.403
     .cli/dotnet-install.sh -i .cli -c 2.0 -v 2.0.3
     .cli/dotnet-install.sh -i .cli -c preview -v 1.0.4
   fi

diff --git a/build/common/common.shared.props b/build/common/common.shared.props
@@ -19,7 +19,7 @@
     <PackagesConfigDirectory>$(RepositoryRootDirectory).nuget\packages\</PackagesConfigDirectory>
     <CIRootDirectory>$(RepositoryRootDirectory).ci\</CIRootDirectory>
     <MSBuildArtifactsDirectory>$(RepositoryRootDirectory)artifacts\msbuild\</MSBuildArtifactsDirectory>
-    <XunitConsoleExePath>$(PackagesConfigDirectory)xunit.runner.console.2.3.1\tools\net452\xunit.console.exe</XunitConsoleExePath>
+    <XunitConsoleExePath>$(PackagesConfigDirectory)xunit.runner.console.2.4.1\tools\net46\xunit.console.exe</XunitConsoleExePath>
     <NupkgOutputDirectory>$(ArtifactsDirectory)nupkgs\</NupkgOutputDirectory>
     <PublishOutputDirectory>$(ArtifactsDirectory)publish\</PublishOutputDirectory>
     <LogOutputDirectory>$(ArtifactsDirectory)logs\</LogOutputDirectory>

diff --git a/build/common/common.targets b/build/common/common.targets
@@ -37,8 +37,8 @@
   <PropertyGroup>
     <FluentAssertionsVersion Condition=" '$(FluentAssertionsVersion)' == '' ">4.19.4</FluentAssertionsVersion>
     <ToStringWithoutOverrideAnalyzerVersion Condition=" '$(ToStringWithoutOverrideAnalyzerVersion)' == '' ">0.5.0</ToStringWithoutOverrideAnalyzerVersion>
-    <TestSDKVersion Condition=" '$(TestSDKVersion)' == '' ">15.7.0</TestSDKVersion>
-    <XunitVersion Condition=" '$(XunitVersion)' == '' ">2.3.1</XunitVersion>
+    <TestSDKVersion Condition=" '$(TestSDKVersion)' == '' ">15.8.0</TestSDKVersion>
+    <XunitVersion Condition=" '$(XunitVersion)' == '' ">2.4.1</XunitVersion>
     <XunitRunnerVisualStudioVersion Condition=" '$(XunitRunnerVisualStudioVersion)' == '' ">$(XunitVersion)</XunitRunnerVisualStudioVersion>
     <SourceLinkVersion Condition=" '$(SourceLinkVersion)' == '' ">2.8.0</SourceLinkVersion>
   </PropertyGroup>

diff --git a/build/common/packages.common.config b/build/common/packages.common.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit.runner.console" version="2.3.1" targetFramework="net46" />
+  <package id="xunit.runner.console" version="2.4.1" targetFramework="net46" />
 </packages>