Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props
<!-- dotnet/dotnet dependencies -->
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.3.25574.108</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25574.108</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25574.108</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.3.25574.108</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25613.101</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25613.101</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25613.101</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25613.101</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>11.0.0-alpha.1.25613.101</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.25613.101</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-alpha.1.25613.101</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>11.0.0-alpha.1.25613.101</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-rc.3.25574.108</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.3.25574.108</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.3.25574.108</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.0-rc.3.25574.108</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.0-rc.3.25574.108</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-rc.3.25574.108</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.0-rc.3.25574.108</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.3.25574.108</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.3.25574.108</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.3.25574.108</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.3.25574.108</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.3.25574.108</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.3.25574.108</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.3.25574.108</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-alpha.1.25613.101</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-alpha.1.25613.101</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>11.0.0-alpha.1.25613.101</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>11.0.0-alpha.1.25613.101</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>11.0.0-alpha.1.25613.101</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-alpha.1.25613.101</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>11.0.0-alpha.1.25613.101</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>11.0.0-alpha.1.25613.101</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-alpha.1.25613.101</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-alpha.1.25613.101</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-alpha.1.25613.101</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-alpha.1.25613.101</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>11.0.0-alpha.1.25613.101</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-alpha.1.25613.101</SystemWindowsExtensionsPackageVersion>
<!-- _git/dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.1.25609.7</MicrosoftDotNetWpfDncEngPackageVersion>
</PropertyGroup>
Expand Down
90 changes: 45 additions & 45 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,78 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="d119b40e8ff3b88f87ad60b04c807233a159b197" BarId="292184" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="dc803dea8a5917a87a812a05bae596c299368a43" BarId="294593" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.3.25574.108">
<Dependency Name="Microsoft.Private.Winforms" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.3.25574.108">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.Windows.Extensions" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25574.108">
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rc.1.25609.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>7b194d1da9c86db654df89ab762a07ac714a95ba</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.Resources.Extensions" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25574.108">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.CodeDom" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.Diagnostics.EventLog" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.DirectoryServices" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.IO.Packaging" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.Security.Permissions" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.Drawing.Common" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand All @@ -84,21 +84,21 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25574.108">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25574.108">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25574.108">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25574.108">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
Expand All @@ -109,9 +109,9 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
</Dependency>
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.3.25574.108">
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="11.0.0-alpha.1.25613.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<Import Project="Version.Details.props" />

<PropertyGroup>
<MajorVersion>10</MajorVersion>
<MajorVersion>11</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
<PreReleaseVersionIteration>3</PreReleaseVersionIteration>
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
<DotNetFinalVersionKind></DotNetFinalVersionKind>
Expand Down
2 changes: 2 additions & 0 deletions eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ jobs:
templateContext: ${{ parameters.templateContext }}

variables:
- name: AllowPtrToDetectTestRunRetryFiles
value: true
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
- name: DOTNET_CLI_TELEMETRY_PROFILE
value: '$(Build.Repository.Uri)'
Expand Down
8 changes: 4 additions & 4 deletions eng/common/core-templates/job/source-index-stage1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ parameters:
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
binlogPath: artifacts/log/Debug/Build.binlog
condition: ''
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
dependsOn: ''
pool: ''
is1ESPipeline: ''
Expand All @@ -25,10 +25,10 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $(DncEngPublicBuildPool)
image: windows.vs2022.amd64.open
image: windows.vs2026preview.scout.amd64.open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $(DncEngInternalBuildPool)
image: windows.vs2022.amd64
image: windows.vs2026preview.scout.amd64

steps:
- ${{ if eq(parameters.is1ESPipeline, '') }}:
Expand All @@ -41,4 +41,4 @@ jobs:

- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
parameters:
binLogPath: ${{ parameters.binLogPath }}
binLogPath: ${{ parameters.binLogPath }}
8 changes: 4 additions & 4 deletions eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ stages:
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: $(DncEngInternalBuildPool)
image: windows.vs2022.amd64
image: windows.vs2026preview.scout.amd64
os: windows
${{ else }}:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64
demands: ImageOverride -equals windows.vs2026preview.scout.amd64

steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
Expand Down Expand Up @@ -175,7 +175,7 @@ stages:
os: windows
${{ else }}:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
Expand Down Expand Up @@ -236,7 +236,7 @@ stages:
os: windows
${{ else }}:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/internal-feed-operations.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function SetupCredProvider {
$url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1'

Write-Host "Writing the contents of 'installcredprovider.ps1' locally..."
Invoke-WebRequest $url -OutFile installcredprovider.ps1
Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1

Write-Host 'Installing plugin...'
.\installcredprovider.ps1 -Force
Expand Down
2 changes: 1 addition & 1 deletion eng/common/post-build/nuget-verification.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if ($NuGetExePath) {
Write-Host "Downloading nuget.exe from $nugetExeUrl..."
$ProgressPreference = 'SilentlyContinue'
try {
Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe
Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe
$ProgressPreference = 'Continue'
} catch {
$ProgressPreference = 'Continue'
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down
Loading
Loading