Skip to content
Merged
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
20 changes: 10 additions & 10 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25611.103</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.25611.103</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25611.103</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.25611.103</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-alpha.1.25611.103</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-alpha.1.25611.103</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-alpha.1.25611.103</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-alpha.1.25611.103</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.25611.103</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.25611.103</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25616.107</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.25616.107</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25616.107</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.25616.107</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-alpha.1.25616.107</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-alpha.1.25616.107</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-alpha.1.25616.107</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-alpha.1.25616.107</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.25616.107</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.25616.107</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.11017</MicrosoftMacCatalystSdknet100_260PackageVersion>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-alpha.1.25611.103">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-alpha.1.25616.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-alpha.1.25611.103">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-alpha.1.25616.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-alpha.1.25611.103">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-alpha.1.25616.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-alpha.1.25611.103">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-alpha.1.25616.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.25611.103">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.25616.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25611.103">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25616.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
</Dependency>
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
Expand All @@ -44,25 +44,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25611.103">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25616.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25611.103">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25616.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.25611.103">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.25616.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25516.4">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>88399512021dfa8b5f45d91f84c8ce6f0959b127</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25611.103">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25616.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
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
19 changes: 13 additions & 6 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {

Retry({
Write-Host "GET $uri"
Invoke-WebRequest $uri -OutFile $installScript
Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript
})
}

Expand Down Expand Up @@ -506,7 +506,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
Write-Host "Downloading $packageName $packageVersion"
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
Retry({
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath
})

if (!(Test-Path $packagePath)) {
Expand Down Expand Up @@ -552,23 +552,30 @@ function LocateVisualStudio([object]$vsRequirements = $null){
Write-Host "Downloading vswhere $vswhereVersion"
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
Retry({
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe
})
}

if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
$vsRequirements = $GlobalJson.tools.vs
} else {
$vsRequirements = $null
}
}

$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')

if (!$excludePrereleaseVS) {
$args += '-prerelease'
}

if (Get-Member -InputObject $vsRequirements -Name 'version') {
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
$args += '-version'
$args += $vsRequirements.version
}

if (Get-Member -InputObject $vsRequirements -Name 'components') {
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
foreach ($component in $vsRequirements.components) {
$args += '-requires'
$args += $component
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "11.0.100-alpha.1.25611.103",
"version": "11.0.100-alpha.1.25616.107",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "11.0.100-alpha.1.25611.103"
"dotnet": "11.0.100-alpha.1.25616.107"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25611.103"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25616.107"
}
}
Loading