Skip to content

Commit

Permalink
Merge branch 'main' into darc-main-ba62105c-6b38-4183-b0b5-5596a77d60f7
Browse files Browse the repository at this point in the history
  • Loading branch information
joeloff authored Nov 15, 2024
2 parents 353527e + 2bfb526 commit 69705a1
Show file tree
Hide file tree
Showing 25 changed files with 265 additions and 265 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"microsoft.dotnet.darc": {
"version": "1.1.0-beta.24555.1",
"version": "1.1.0-beta.24562.2",
"commands": [
"darc"
]
Expand Down
248 changes: 124 additions & 124 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

102 changes: 51 additions & 51 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24555.1</MicrosoftDotNetDarcLibVersion>
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24562.2</MicrosoftDotNetDarcLibVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
Expand All @@ -108,43 +108,43 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.24560.2</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24560.2</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24560.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-alpha.1.24560.2</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETHostModelVersion>10.0.0-alpha.1.24560.2</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0-alpha.1.24560.2</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-alpha.1.24560.2</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-alpha.1.24560.2</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-alpha.1.24560.2</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.24560.2</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>10.0.0-alpha.1.24560.2</SystemServiceProcessServiceControllerVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.24564.7</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24564.7</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24564.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-alpha.1.24564.7</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETHostModelVersion>10.0.0-alpha.1.24564.7</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0-alpha.1.24564.7</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-alpha.1.24564.7</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-alpha.1.24564.7</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-alpha.1.24564.7</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.24564.7</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>10.0.0-alpha.1.24564.7</SystemServiceProcessServiceControllerVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-alpha.1.24560.2</MicrosoftNETCorePlatformsPackageVersion>
<VSRedistCommonNetCoreTargetingPackx64100PackageVersion>10.0.0-alpha.1.24560.2</VSRedistCommonNetCoreTargetingPackx64100PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>10.0.0-alpha.1.24560.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-alpha.1.24560.2</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0-alpha.1.24560.2</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-alpha.1.24560.2</MicrosoftWin32SystemEventsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-alpha.1.24564.7</MicrosoftNETCorePlatformsPackageVersion>
<VSRedistCommonNetCoreTargetingPackx64100PackageVersion>10.0.0-alpha.1.24564.7</VSRedistCommonNetCoreTargetingPackx64100PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>10.0.0-alpha.1.24564.7</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-alpha.1.24564.7</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0-alpha.1.24564.7</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-alpha.1.24564.7</MicrosoftWin32SystemEventsPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-alpha.1.24560.2</SystemCodeDomPackageVersion>
<SystemCompositionAttributedModelPackageVersion>10.0.0-alpha.1.24560.2</SystemCompositionAttributedModelPackageVersion>
<SystemCompositionConventionPackageVersion>10.0.0-alpha.1.24560.2</SystemCompositionConventionPackageVersion>
<SystemCompositionHostingPackageVersion>10.0.0-alpha.1.24560.2</SystemCompositionHostingPackageVersion>
<SystemCompositionRuntimePackageVersion>10.0.0-alpha.1.24560.2</SystemCompositionRuntimePackageVersion>
<SystemCompositionTypedPartsPackageVersion>10.0.0-alpha.1.24560.2</SystemCompositionTypedPartsPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-alpha.1.24560.2</SystemConfigurationConfigurationManagerPackageVersion>
<SystemReflectionMetadataLoadContextVersion>10.0.0-alpha.1.24560.2</SystemReflectionMetadataLoadContextVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-alpha.1.24560.2</SystemResourcesExtensionsPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>10.0.0-alpha.1.24560.2</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-alpha.1.24560.2</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-alpha.1.24560.2</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-alpha.1.24560.2</SystemSecurityPermissionsPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>10.0.0-alpha.1.24560.2</SystemTextEncodingCodePagesPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-alpha.1.24560.2</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-alpha.1.24560.2</SystemWindowsExtensionsPackageVersion>
<SystemIOHashingPackageVersion>10.0.0-alpha.1.24560.2</SystemIOHashingPackageVersion>
<SystemFormatsAsn1Version>10.0.0-alpha.1.24560.2</SystemFormatsAsn1Version>
<SystemCodeDomPackageVersion>10.0.0-alpha.1.24564.7</SystemCodeDomPackageVersion>
<SystemCompositionAttributedModelPackageVersion>10.0.0-alpha.1.24564.7</SystemCompositionAttributedModelPackageVersion>
<SystemCompositionConventionPackageVersion>10.0.0-alpha.1.24564.7</SystemCompositionConventionPackageVersion>
<SystemCompositionHostingPackageVersion>10.0.0-alpha.1.24564.7</SystemCompositionHostingPackageVersion>
<SystemCompositionRuntimePackageVersion>10.0.0-alpha.1.24564.7</SystemCompositionRuntimePackageVersion>
<SystemCompositionTypedPartsPackageVersion>10.0.0-alpha.1.24564.7</SystemCompositionTypedPartsPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-alpha.1.24564.7</SystemConfigurationConfigurationManagerPackageVersion>
<SystemReflectionMetadataLoadContextVersion>10.0.0-alpha.1.24564.7</SystemReflectionMetadataLoadContextVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-alpha.1.24564.7</SystemResourcesExtensionsPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>10.0.0-alpha.1.24564.7</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-alpha.1.24564.7</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-alpha.1.24564.7</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-alpha.1.24564.7</SystemSecurityPermissionsPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>10.0.0-alpha.1.24564.7</SystemTextEncodingCodePagesPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-alpha.1.24564.7</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-alpha.1.24564.7</SystemWindowsExtensionsPackageVersion>
<SystemIOHashingPackageVersion>10.0.0-alpha.1.24564.7</SystemIOHashingPackageVersion>
<SystemFormatsAsn1Version>10.0.0-alpha.1.24564.7</SystemFormatsAsn1Version>
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
<MicrosoftBclAsyncInterfacesToolsetPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesToolsetPackageVersion>
Expand Down Expand Up @@ -236,19 +236,19 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24561.6</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24563.16</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-rc.2.24474.3</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24561.6</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24561.6</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24561.6</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24561.6</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24563.16</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24563.16</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24563.16</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24563.16</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-rc.2.24474.3</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24561.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24561.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24561.6</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24561.6</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24561.6</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24561.6</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24563.16</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24563.16</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24563.16</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24563.16</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24563.16</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24563.16</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/razor -->
Expand Down Expand Up @@ -284,10 +284,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24555.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24555.1</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24555.1</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24555.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24564.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24564.1</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24564.1</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24564.1</MicrosoftDotNetXUnitExtensionsVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
Expand Down
5 changes: 3 additions & 2 deletions eng/common/core-templates/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ parameters:
# The name of the job. This is included in the job ID.
# targetRID: ''
# The name of the target RID to use, instead of the one auto-detected by Arcade.
# nonPortable: false
# portableBuild: false
# Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
# linux-x64), and compiling against distro-provided packages rather than portable ones.
# linux-x64), and compiling against distro-provided packages rather than portable ones. The
# default is portable mode.
# skipPublishValidation: false
# Disables publishing validation. By default, a check is performed to ensure no packages are
# published by source-build.
Expand Down
7 changes: 6 additions & 1 deletion eng/common/core-templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ steps:
assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
fi
portableBuildArgs=
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
fi
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
--configuration $buildConfig \
--restore --build --pack $publishArgs -bl \
Expand All @@ -85,7 +90,7 @@ steps:
$targetRidArgs \
$runtimeOsArgs \
$baseOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
$portableBuildArgs \
/p:DotNetBuildSourceOnly=true \
/p:DotNetBuildRepo=true \
/p:AssetManifestFileName=$assetManifestFileName
Expand Down
6 changes: 3 additions & 3 deletions eng/common/native/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ case "$os" in
apt update

apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
libssl-dev libkrb5-dev zlib1g-dev pigz
libssl-dev libkrb5-dev zlib1g-dev pigz cpio

localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
elif [ "$ID" = "fedora" ]; then
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz cpio
elif [ "$ID" = "alpine" ]; then
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz cpio
else
echo "Unsupported distro. distro: $ID"
exit 1
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 @@ -64,7 +64,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.10.0-pre.4.0" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0
$defaultXCopyMSBuildVersion = '17.10.0-pre.4.0'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
$defaultXCopyMSBuildVersion = '17.12.0'

if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down
7 changes: 4 additions & 3 deletions eng/pipelines/templates/jobs/sdk-job-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ parameters:
runTestsAsTool: true
# This job uses the build step for testing, so the extra test step is not necessary.
runTests: false
- categoryName: TemplateEngine
testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
publishXunitResults: true
# turn off template engine for windows because of agent images, VS versions and COM issues.
# - categoryName: TemplateEngine
# testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
# publishXunitResults: true
- categoryName: AoT
runAoTTests: true
### LINUX ###
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24555.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24555.1",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24564.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
}
Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Container contains checked-out source code only
{
"name": "Default",
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39",
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41",
"hostRequirements": {
// A completely source built .NET is >64 GB with all the repos/artifacts
"storage": "128gb"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Container contains a pre-built SDK
{
"name": "Pre-built .NET SDK",
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39",
"image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41",
"hostRequirements": {
// A completely source built .NET is >64 GB with all the repos/artifacts
"storage": "128gb"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ resources:
branches:
include:
- refs/heads/release/*.0.1xx-preview*
- refs/heads/release/9.0.1xx
- refs/heads/internal/release/*.0.1xx*

repositories:
Expand Down
2 changes: 0 additions & 2 deletions src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ schedules:
include:
- main
- release/*.0.1xx-preview*
- release/9.0.1xx
- internal/release/*.0.1xx*

pr: none
Expand All @@ -20,7 +19,6 @@ trigger:
include:
- main
- release/*.0.1xx-preview*
- release/9.0.1xx
- internal/release/*.0.1xx*
paths:
include:
Expand Down
Loading

0 comments on commit 69705a1

Please sign in to comment.