Skip to content

Combined dependency update #111852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Jan 30, 2025
Merged

Combined dependency update #111852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
3c23c99
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 13, 2025
e18aac9
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Jan 13, 2025
b8a7df7
Update dependencies from https://github.com/dotnet/cecil build 202501…
dotnet-maestro[bot] Jan 13, 2025
053833e
Update dependencies from https://github.com/dotnet/sdk build 20250112.16
dotnet-maestro[bot] Jan 13, 2025
3775e53
Update dependencies from https://github.com/dotnet/icu build 20250113.1
dotnet-maestro[bot] Jan 14, 2025
bacdb66
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Jan 14, 2025
ca80ea8
Merge branch 'main' into darc-main-f38279c4-82bf-4e68-8b36-0aedea2e0dd1
lewing Jan 15, 2025
a2b7b97
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 18, 2025
0ac05d0
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Jan 20, 2025
0be460c
Update dependencies from https://github.com/dotnet/runtime build 2025…
dotnet-maestro[bot] Jan 20, 2025
625691f
Merge branch 'main' into darc-main-f38279c4-82bf-4e68-8b36-0aedea2e0dd1
MichalStrehovsky Jan 20, 2025
6da4345
Update dependencies from https://github.com/dotnet/icu build 20250119.1
dotnet-maestro[bot] Jan 21, 2025
4faa7dd
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Jan 21, 2025
dbb922a
Update dependencies from https://github.com/dotnet/sdk build 20250120.10
dotnet-maestro[bot] Jan 21, 2025
60e7641
Update dependencies from https://github.com/dotnet/command-line-api b…
dotnet-maestro[bot] Jan 22, 2025
6dfacae
Update dependencies from https://github.com/dotnet/command-line-api b…
dotnet-maestro[bot] Jan 23, 2025
94258bd
Revert System.CommandLine update
ViktorHofer Jan 23, 2025
7e8fb30
Update dependencies from https://github.com/dotnet/sdk build 20250123.10
dotnet-maestro[bot] Jan 23, 2025
a1ca057
Remove dependency on sdk SB intermediate
mthalman Jan 24, 2025
ef7d723
allow prebuilt for Microsoft.DotNet.ApiCompat.Task
mthalman Jan 24, 2025
b4aad36
Update dependencies from https://github.com/dotnet/icu build 20250124.1
dotnet-maestro[bot] Jan 25, 2025
aca90a2
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Jan 27, 2025
00d3c57
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 27, 2025
7d567a6
Update dependencies from https://github.com/dotnet/cecil build 202501…
dotnet-maestro[bot] Jan 27, 2025
55ca7d6
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Jan 27, 2025
6a08bc7
Merge remote-tracking branch 'upstream/darc-main-e85abdc6-10ef-4523-9…
MichalStrehovsky Jan 27, 2025
b3bdd85
Merge remote-tracking branch 'upstream/darc-main-f38279c4-82bf-4e68-8…
MichalStrehovsky Jan 27, 2025
7d1daa6
Update SDK to 10.0.100-alpha.1.25077.2 (to fix a deps.json regression)
ViktorHofer Jan 27, 2025
c471757
Merge branch 'main' into combined
ViktorHofer Jan 28, 2025
0dda9d3
Update Microsoft.DotNet.ApiCompat.Task version
ViktorHofer Jan 28, 2025
3e12ead
Update aspnetcore versions
akoeplinger Jan 30, 2025
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
1 change: 1 addition & 0 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<UsagePattern IdentityGlob="*Microsoft.DotNet.ILCompiler/*10.*" />

<!-- Allowed and pinned to SDK version -->
<UsagePattern IdentityGlob="Microsoft.DotNet.ApiCompat.Task/*10.*" />
<UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/*10.*" />

<!-- This version is brought in transitively from NuGet.Packaging.6.2.4.
Expand Down
206 changes: 100 additions & 106 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

82 changes: 41 additions & 41 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,33 +83,33 @@
<PropertyGroup>
<StaticCsVersion>0.2.0</StaticCsVersion>
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24622.2</MicrosoftDotNetApiCompatTaskVersion>
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.25077.2</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25058.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25058.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25058.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25058.4</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25058.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25058.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25058.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25058.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25058.4</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25076.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25076.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25076.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25076.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25076.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25076.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25076.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25076.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25076.1</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-alpha.1.25057.24</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-alpha.1.25068.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
<!-- ILAsm dependencies -->
<MicrosoftNETCoreILAsmVersion>10.0.0-alpha.1.25057.24</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILAsmVersion>10.0.0-alpha.1.25068.1</MicrosoftNETCoreILAsmVersion>
<!-- Libraries dependencies -->
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftBclHashCodeVersion>6.0.0</MicrosoftBclHashCodeVersion>
Expand All @@ -123,46 +123,46 @@
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
<SystemMemoryVersion>4.6.0</SystemMemoryVersion>
<SystemNumericsVectorsVersion>4.6.0</SystemNumericsVectorsVersion>
<SystemReflectionMetadataVersion>10.0.0-alpha.1.25057.24</SystemReflectionMetadataVersion>
<SystemReflectionMetadataLoadContextVersion>10.0.0-alpha.1.25057.24</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataVersion>10.0.0-alpha.1.25068.1</SystemReflectionMetadataVersion>
<SystemReflectionMetadataLoadContextVersion>10.0.0-alpha.1.25068.1</SystemReflectionMetadataLoadContextVersion>
<SystemSecurityAccessControlVersion>6.0.0</SystemSecurityAccessControlVersion>
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
<SystemSecurityCryptographyOpenSslVersion>5.0.0</SystemSecurityCryptographyOpenSslVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
<SystemSecurityPermissionsVersion>7.0.0</SystemSecurityPermissionsVersion>
<SystemTextJsonVersion>10.0.0-alpha.1.25057.24</SystemTextJsonVersion>
<SystemTextJsonVersion>10.0.0-alpha.1.25068.1</SystemTextJsonVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemThreadingAccessControlVersion>7.0.0</SystemThreadingAccessControlVersion>
<SystemThreadingTasksExtensionsVersion>4.6.0</SystemThreadingTasksExtensionsVersion>
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<runtimenativeSystemIOPortsVersion>10.0.0-alpha.1.25057.24</runtimenativeSystemIOPortsVersion>
<runtimenativeSystemIOPortsVersion>10.0.0-alpha.1.25068.1</runtimenativeSystemIOPortsVersion>
<!-- Keep toolset versions in sync with dotnet/msbuild and dotnet/sdk -->
<SystemCollectionsImmutableToolsetVersion>8.0.0</SystemCollectionsImmutableToolsetVersion>
<SystemTextJsonToolsetVersion>8.0.4</SystemTextJsonToolsetVersion>
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
<SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
<!-- Runtime-Assets dependencies -->
<SystemRuntimeNumericsTestDataVersion>10.0.0-beta.25060.2</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>10.0.0-beta.25060.2</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>10.0.0-beta.25060.2</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>10.0.0-beta.25060.2</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>10.0.0-beta.25060.2</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>10.0.0-beta.25060.2</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>10.0.0-beta.25060.2</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>10.0.0-beta.25060.2</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>10.0.0-beta.25060.2</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>10.0.0-beta.25060.2</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>10.0.0-beta.25060.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>10.0.0-beta.25060.2</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>10.0.0-beta.25060.2</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>10.0.0-beta.25060.2</MicrosoftDotNetCilStripSourcesVersion>
<MicrosoftNETHostModelTestDataVersion>10.0.0-beta.25060.2</MicrosoftNETHostModelTestDataVersion>
<SystemRuntimeNumericsTestDataVersion>10.0.0-beta.25070.2</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>10.0.0-beta.25070.2</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>10.0.0-beta.25070.2</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>10.0.0-beta.25070.2</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>10.0.0-beta.25070.2</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>10.0.0-beta.25070.2</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>10.0.0-beta.25070.2</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>10.0.0-beta.25070.2</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>10.0.0-beta.25070.2</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>10.0.0-beta.25070.2</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>10.0.0-beta.25070.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>10.0.0-beta.25070.2</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>10.0.0-beta.25070.2</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>10.0.0-beta.25070.2</MicrosoftDotNetCilStripSourcesVersion>
<MicrosoftNETHostModelTestDataVersion>10.0.0-beta.25070.2</MicrosoftNETHostModelTestDataVersion>
<!-- xharness dependencies -->
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>10.0.0-prerelease.24610.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>10.0.0-prerelease.24610.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>10.0.0-prerelease.24610.1</MicrosoftDotNetXHarnessCLIVersion>
<!-- hotreload-utils dependencies -->
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>10.0.0-alpha.0.24627.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>10.0.0-alpha.0.25070.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.25067.2</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.25067.2</optimizationwindows_ntx86MIBCRuntimeVersion>
Expand Down Expand Up @@ -219,9 +219,9 @@
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>9.0.0-preview-20241010.1</MicrosoftPrivateIntellisenseVersion>
<!-- Mono Cecil -->
<MicrosoftDotNetCecilVersion>0.11.5-alpha.24627.1</MicrosoftDotNetCecilVersion>
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25069.2</MicrosoftDotNetCecilVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>10.0.0-alpha.1.24627.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>10.0.0-preview.2.25074.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.3</MicrosoftNativeQuicMsQuicSchannelVersion>
<SystemNetMsQuicTransportVersion>9.0.0-alpha.1.24167.3</SystemNetMsQuicTransportVersion>
Expand Down
10 changes: 0 additions & 10 deletions eng/common/internal/Tools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,6 @@
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
</ItemGroup>
<PropertyGroup>
<RestoreSources></RestoreSources>
<RestoreSources Condition="'$(UsingToolIbcOptimization)' == 'true'">
https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
</RestoreSources>
<RestoreSources Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
$(RestoreSources);
https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json;
</RestoreSources>
</PropertyGroup>

<!-- Repository extensibility point -->
<Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }

# Enable repos to use a particular version of the on-line dotnet-install scripts.
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }

# True to use global NuGet cache instead of restoring packages to repository-local directory.
Expand Down Expand Up @@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
if (!(Test-Path $installScript)) {
Create-Directory $dotnetRoot
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1"

Retry({
Write-Host "GET $uri"
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}

# Enable repos to use a particular version of the on-line dotnet-install scripts.
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}

# True to use global NuGet cache instead of restoring packages to repository-local directory.
Expand Down Expand Up @@ -295,7 +295,7 @@ function with_retries {
function GetDotNetInstallScript {
local root=$1
local install_script="$root/dotnet-install.sh"
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh"

if [[ ! -a "$install_script" ]]; then
mkdir -p "$root"
Expand Down
12 changes: 6 additions & 6 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"sdk": {
"version": "10.0.100-alpha.1.24610.7",
"version": "10.0.100-alpha.1.25077.2",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "10.0.100-alpha.1.24610.7"
"dotnet": "10.0.100-alpha.1.25077.2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25058.4",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25058.4",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25058.4",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25076.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25076.1",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25076.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25057.24"
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25068.1"
}
}
4 changes: 2 additions & 2 deletions src/mono/sample/wasm/blazor-frame/blazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

<ItemGroup>
<!-- TODO un-pin this when it's possible -->
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-alpha.2.24572.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-alpha.2.24572.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-alpha.2.25073.4" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-alpha.2.25073.4" PrivateAssets="all" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/mono/wasm/testassets/BlazorBasicTestApp/App/BlazorBasicTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-alpha.2.24572.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-alpha.2.24572.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-alpha.2.25073.4" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-alpha.2.25073.4" PrivateAssets="all" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/mono/wasm/testassets/BlazorBasicTestApp/RazorClassLibrary/RazorClassLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.24572.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.25073.4" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0-alpha.2.24572.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0-alpha.2.25073.4" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<!-- versions are pinned but when run from WBT level, it's taking in-tree runtime -->
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-alpha.2.24572.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-alpha.2.24572.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-alpha.2.25073.4" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-alpha.2.25073.4" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<!-- versions are pinned but when run from WBT level, it's taking in-tree runtime -->
<ItemGroup>
<PackageReference Include="System.Net.Http.Json" Version="10.0.0-alpha.1.24570.9 " />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0-alpha.2.24572.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0-alpha.2.25073.4" />
</ItemGroup>
</Project>
Loading