Patched CVE-2019-0657. (#3436)

microsoft · Mar 3, 2022 · ffdb3d0 · ffdb3d0
1 parent 7e16306
commit ffdb3d0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -130,11 +130,11 @@ function Invoke-Build
  $dotnetExe = Get-DotNetPath
 
  Write-Log ".. .. Build: Source: $TPB_Solution"
- Invoke-Exe $dotnetExe -Arguments "build $TPB_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -bl:TestPlatform.binlog"
+ Invoke-Exe $dotnetExe -Arguments "build $TPB_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -bl:""$env:TP_OUT_DIR\log\$Configuration\TestPlatform.binlog"""
  Write-Log ".. .. Build: Complete."
 
  Write-Log ".. .. Build: Source: $TPB_TestAssets_CILAssets"
- Invoke-Exe $dotnetExe -Arguments "build $TPB_TestAssets_CILAssets --configuration $TPB_Configuration -v:minimal -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -bl:""$($env:TP_ROOT_DIR)\CILAssets.binlog"""
+ Invoke-Exe $dotnetExe -Arguments "build $TPB_TestAssets_CILAssets --configuration $TPB_Configuration -v:minimal -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -bl:""$env:TP_OUT_DIR\log\$Configuration\CILAssets.binlog"""
  Write-Log ".. .. Build: Complete."
  Write-Log "Invoke-Build: Complete. {$(Get-ElapsedTime($timer))}"
 }
@@ -151,7 +151,7 @@ function Invoke-TestAssetsBuild
  try {
  Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution -- add NuGet source"
  Invoke-Exe -IgnoreExitCode 1 $nugetExe -Arguments "sources add -Name ""locally-built-testplatform-packages"" -Source $env:TP_TESTARTIFACTS\packages\ -ConfigFile ""$nugetConfig"""
- Invoke-Exe $dotnetExe -Arguments "build $TPB_TestAssets_Solution --configuration $TPB_Configuration -v:minimal -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -bl:""$($env:TP_ROOT_DIR)\TestAssets.binlog"""
+ Invoke-Exe $dotnetExe -Arguments "build $TPB_TestAssets_Solution --configuration $TPB_Configuration -v:minimal -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -bl:""$env:TP_OUT_DIR\log\$Configuration\TestAssets.binlog"""
  }
  finally {
  Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution -- remove NuGet source"

diff --git a/scripts/common.lib.ps1 b/scripts/common.lib.ps1
@@ -120,10 +120,10 @@ function Install-DotNetCli
  & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Version '3.1.22' -Channel '3.1' -Architecture x86 -NoPath
  ${env:DOTNET_ROOT(x86)} = "${dotnetInstallPath}_x86"
 
- & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Version '5.0.10' -Channel '5.0' -Architecture x64 -NoPath
+ & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Version '5.0.14' -Channel '5.0' -Architecture x64 -NoPath
  $env:DOTNET_ROOT= $dotnetInstallPath
 
- & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Version '5.0.10' -Channel '5.0' -Architecture x86 -NoPath
+ & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Version '5.0.14' -Channel '5.0' -Architecture x86 -NoPath
  ${env:DOTNET_ROOT(x86)} = "${dotnetInstallPath}_x86"
 
  $env:DOTNET_MULTILEVEL_LOOKUP=0

diff --git a/src/testhost.arm64/testhost.arm64.csproj b/src/testhost.arm64/testhost.arm64.csproj
@@ -46,6 +46,7 @@
 
  <!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
  <PackageReference Include="System.Private.Uri" Version="$(SystemUriVersion)" />
+ <PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.4" Condition=" $(TargetFramework.StartsWith('net4')) OR '$(TargetFramework)' == 'netcoreapp1.0'" />
  <!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
  </ItemGroup>
  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) AND '$(OS)' != 'Windows_NT' ">

diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj
@@ -45,6 +45,7 @@
 
  <!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
  <PackageReference Include="System.Private.Uri" Version="$(SystemUriVersion)" />
+ <PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.4" Condition=" $(TargetFramework.StartsWith('net4')) OR '$(TargetFramework)' == 'netcoreapp1.0'" />
  <!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
  </ItemGroup>
  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) AND '$(OS)' != 'Windows_NT' ">

diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj
@@ -46,6 +46,7 @@
 
  <!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
  <PackageReference Include="System.Private.Uri" Version="$(SystemUriVersion)" />
+ <PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.4" Condition=" $(TargetFramework.StartsWith('net4')) OR '$(TargetFramework)' == 'netcoreapp1.0'" />
  <!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
  </ItemGroup>
  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) AND '$(OS)' != 'Windows_NT' ">