diff --git a/Make.config b/Make.config
index 6945ad06ac61..945374279ba4 100644
--- a/Make.config
+++ b/Make.config
@@ -12,7 +12,7 @@ CURL = curl --fail --location --connect-timeout 15 $(if $(V),--verbose,--silent)
# --retry-all-errors: ignore the definition of insanity and retry even for errors that seem like you'd get the same result (such as 404). This isn't the real purpose, because this will also retry errors that will get a different result (such as connection failures / resets), which apparently --retry doesn't cover.
CURL_RETRY = $(CURL) --retry 20 --retry-delay 2 --retry-all-errors
-DOTNET_TFM=net10.0
+DOTNET_TFM=net11.0
DOTNET_MAJOR_VERSION:=$(firstword $(subst ., ,$(subst net,,$(DOTNET_TFM))))
# calculate commit distance and store it in a file so that we don't have to re-calculate it every time make is executed.
@@ -389,8 +389,9 @@ export DOTNET_ROOT=$(DOTNET_DIR)
export PATH := $(DOTNET_DIR):$(PATH)
DOTNET=$(DOTNET_DIR)/dotnet
DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/$(DOTNET_TFM))
+# when bumping to a new .NET version, there may be a period when some parts of .NET is still on the old .NET version, so handle that here for DOTNET_BCL_DIR
ifneq ($(DOTNET_BCL_DIR),$(shell ls -1d $(DOTNET_BCL_DIR) 2>/dev/null))
-DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/net8.0)
+DOTNET_BCL_DIR:=$(abspath $(wildcard $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/net*.0))
endif
DOTNET_ANALYZERS_DIR?=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION_BAND)/Sdks/Microsoft.NET.Sdk/analyzers
diff --git a/Make.versions b/Make.versions
index 5d70af16166f..60702d349290 100644
--- a/Make.versions
+++ b/Make.versions
@@ -120,6 +120,11 @@ SUPPORTED_API_VERSIONS_TVOS+=net9.0-26.0
SUPPORTED_API_VERSIONS_MACOS+=net9.0-26.0
SUPPORTED_API_VERSIONS_MACCATALYST+=net9.0-26.0
+SUPPORTED_API_VERSIONS_IOS+=net10.0-26.0
+SUPPORTED_API_VERSIONS_TVOS+=net10.0-26.0
+SUPPORTED_API_VERSIONS_MACOS+=net10.0-26.0
+SUPPORTED_API_VERSIONS_MACCATALYST+=net10.0-26.0
+
# Add beta versions here!
# Don't change these (even if there aren't any beta versions)!
diff --git a/NuGet.config b/NuGet.config
index f51539aa7c95..c57ea829e5fa 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,8 +10,6 @@
-
-
@@ -26,32 +24,13 @@
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
index 55f4ff8cce66..d0b14871ece8 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
@@ -1,6 +1,6 @@
- net10.0-maccatalyst
+ net11.0-maccatalyst
- 10.0.0-beta.25507.103
- 10.0.0-beta.25507.103
- 0.11.5-alpha.25507.103
- 10.0.0-beta.25507.103
- 10.0.0-rtm.25507.103
- 10.0.0-rtm.25507.103
- 10.0.0-rtm.25507.103
- 10.0.100-rtm.25507.103
- 10.0.0-rtm.25507.103
- 10.0.100-rtm.25507.103
+ 11.0.0-beta.25508.109
+ 11.0.0-beta.25508.109
+ 0.11.5-alpha.25508.109
+ 11.0.0-beta.25508.109
+ 10.0.0-rc.1.25508.109
+ 10.0.0-rc.1.25508.109
+ 10.0.0-rc.1.25508.109
+ 10.0.100-rc.2.25508.109
+ 10.0.0-rc.1.25508.109
+ 11.0.100-alpha.1.25508.109
- 18.5.9227
+ 26.0.11002-net10-ga
26.0.9754
- 18.5.9227
+ 26.0.11002-net10-ga
26.0.9754
- 15.5.9227
+ 26.0.11002-net10-ga
26.0.9754
- 18.5.9227
+ 26.0.11002-net10-ga
26.0.9754
18.0.9617
@@ -47,13 +47,13 @@ This file should be imported by eng/Versions.props
$(MicrosoftNETCoreAppRefPackageVersion)
$(MicrosoftTemplateEngineAuthoringTasksPackageVersion)
- $(MicrosoftiOSSdknet90_185PackageVersion)
+ $(MicrosoftiOSSdknet100_260PackageVersion)
$(MicrosoftiOSSdknet90_260PackageVersion)
- $(MicrosoftMacCatalystSdknet90_185PackageVersion)
+ $(MicrosoftMacCatalystSdknet100_260PackageVersion)
$(MicrosoftMacCatalystSdknet90_260PackageVersion)
- $(MicrosoftmacOSSdknet90_155PackageVersion)
+ $(MicrosoftmacOSSdknet100_260PackageVersion)
$(MicrosoftmacOSSdknet90_260PackageVersion)
- $(MicrosofttvOSSdknet90_185PackageVersion)
+ $(MicrosofttvOSSdknet100_260PackageVersion)
$(MicrosofttvOSSdknet90_260PackageVersion)
$(MicrosoftiOSSdknet90_180PackageVersion)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d7a2da17b68a..5d86ea02bd48 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,46 +1,46 @@
-
+
https://github.com/dotnet/dotnet
- 915977521b41280adbe21a54345be23cb5bf3536
+ 64d877a07af8c020fe9da6e721bc2258894f31ee
-
+
https://github.com/dotnet/dotnet
- 915977521b41280adbe21a54345be23cb5bf3536
+ 64d877a07af8c020fe9da6e721bc2258894f31ee
-
+
https://github.com/dotnet/dotnet
- 915977521b41280adbe21a54345be23cb5bf3536
+ 64d877a07af8c020fe9da6e721bc2258894f31ee
-
+
https://github.com/dotnet/dotnet
- 915977521b41280adbe21a54345be23cb5bf3536
+ 64d877a07af8c020fe9da6e721bc2258894f31ee
-
+
https://github.com/dotnet/dotnet
- 915977521b41280adbe21a54345be23cb5bf3536
+ 64d877a07af8c020fe9da6e721bc2258894f31ee
-
+
https://github.com/dotnet/dotnet
- 915977521b41280adbe21a54345be23cb5bf3536
+ 64d877a07af8c020fe9da6e721bc2258894f31ee
-
+
https://github.com/dotnet/macios
- 4681bf928d70aa79cff2c33ad324b3be9c62b66d
+ 4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3
-
+
https://github.com/dotnet/macios
- 4681bf928d70aa79cff2c33ad324b3be9c62b66d
+ 4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3
-
+
https://github.com/dotnet/macios
- 4681bf928d70aa79cff2c33ad324b3be9c62b66d
+ 4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3
-
+
https://github.com/dotnet/macios
- 4681bf928d70aa79cff2c33ad324b3be9c62b66d
+ 4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3
@@ -59,44 +59,44 @@
https://github.com/xamarin/xamarin-macios
797d30720e5e629d23eb146935da94cb1b61047e
-
-
+
+
https://github.com/dotnet/macios
- 4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3
+ 22667ee447b47151bbb5626feaeda002a82837b9
-
+
https://github.com/dotnet/macios
- 4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3
+ 22667ee447b47151bbb5626feaeda002a82837b9
-
+
https://github.com/dotnet/macios
- 4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3
+ 22667ee447b47151bbb5626feaeda002a82837b9
-
+
https://github.com/dotnet/macios
- 4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3
+ 22667ee447b47151bbb5626feaeda002a82837b9
-
+
https://github.com/dotnet/dotnet
- 915977521b41280adbe21a54345be23cb5bf3536
+ 64d877a07af8c020fe9da6e721bc2258894f31ee
-
+
https://github.com/dotnet/dotnet
- 915977521b41280adbe21a54345be23cb5bf3536
+ 64d877a07af8c020fe9da6e721bc2258894f31ee
-
+
https://github.com/dotnet/dotnet
- 915977521b41280adbe21a54345be23cb5bf3536
+ 64d877a07af8c020fe9da6e721bc2258894f31ee
https://github.com/dotnet/xharness
cbaa911ef1bce4cf92a7e4f7ffa5171eddd1a8fd
-
+
https://github.com/dotnet/dotnet
- 915977521b41280adbe21a54345be23cb5bf3536
+ 64d877a07af8c020fe9da6e721bc2258894f31ee
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 9767bb411a4f..ec3e80d189ea 100644
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -92,7 +92,7 @@ runtime_source_feed=''
runtime_source_feed_key=''
properties=()
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
case "$opt" in
-help|-h)
diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml
index 5ce518406198..cb4ccc023a33 100644
--- a/eng/common/core-templates/job/job.yml
+++ b/eng/common/core-templates/job/job.yml
@@ -19,6 +19,8 @@ parameters:
# publishing defaults
artifacts: ''
enableMicrobuild: false
+ enablePreviewMicrobuild: false
+ microbuildPluginVersion: 'latest'
enableMicrobuildForMacAndLinux: false
microbuildUseESRP: true
enablePublishBuildArtifacts: false
@@ -128,6 +130,8 @@ jobs:
- template: /eng/common/core-templates/steps/install-microbuild.yml
parameters:
enableMicrobuild: ${{ parameters.enableMicrobuild }}
+ enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
+ microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
continueOnError: ${{ parameters.continueOnError }}
@@ -153,6 +157,8 @@ jobs:
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
parameters:
enableMicrobuild: ${{ parameters.enableMicrobuild }}
+ enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
+ microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
continueOnError: ${{ parameters.continueOnError }}
diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml
index c05f65027979..003f7eae0fa5 100644
--- a/eng/common/core-templates/steps/generate-sbom.yml
+++ b/eng/common/core-templates/steps/generate-sbom.yml
@@ -5,7 +5,7 @@
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.
parameters:
- PackageVersion: 10.0.0
+ PackageVersion: 11.0.0
BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
PackageName: '.NET'
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml
new file mode 100644
index 000000000000..9fdf3a116774
--- /dev/null
+++ b/eng/common/core-templates/steps/install-microbuild-impl.yml
@@ -0,0 +1,34 @@
+parameters:
+ - name: microbuildTaskInputs
+ type: object
+ default: {}
+
+ - name: microbuildEnv
+ type: object
+ default: {}
+
+ - name: enablePreviewMicrobuild
+ type: boolean
+ default: false
+
+ - name: condition
+ type: string
+
+ - name: continueOnError
+ type: boolean
+
+steps:
+- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
+ - task: MicroBuildSigningPluginPreview@4
+ displayName: Install Preview MicroBuild plugin (Windows)
+ inputs: ${{ parameters.microbuildTaskInputs }}
+ env: ${{ parameters.microbuildEnv }}
+ continueOnError: ${{ parameters.continueOnError }}
+ condition: ${{ parameters.condition }}
+- ${{ else }}:
+ - task: MicroBuildSigningPlugin@4
+ displayName: Install MicroBuild plugin (Windows)
+ inputs: ${{ parameters.microbuildTaskInputs }}
+ env: ${{ parameters.microbuildEnv }}
+ continueOnError: ${{ parameters.continueOnError }}
+ condition: ${{ parameters.condition }}
\ No newline at end of file
diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml
index d6b9878f54db..bdebec0eaa9b 100644
--- a/eng/common/core-templates/steps/install-microbuild.yml
+++ b/eng/common/core-templates/steps/install-microbuild.yml
@@ -4,6 +4,8 @@ parameters:
# Enable install tasks for MicroBuild on Mac and Linux
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
enableMicrobuildForMacAndLinux: false
+ # Enable preview version of MB signing plugin
+ enablePreviewMicrobuild: false
# Determines whether the ESRP service connection information should be passed to the signing plugin.
# This overlaps with _SignType to some degree. We only need the service connection for real signing.
# It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place.
@@ -14,6 +16,8 @@ parameters:
# Location of the MicroBuild output folder
# NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
microBuildOutputFolder: '$(Build.SourcesDirectory)'
+ # Microbuild version
+ microbuildPluginVersion: 'latest'
continueOnError: false
@@ -51,41 +55,45 @@ steps:
# YAML expansion, and Windows vs. Linux/Mac uses different service connections. However,
# we can avoid including the MB install step if not enabled at all. This avoids a bunch of
# extra pipeline authorizations, since most pipelines do not sign on non-Windows.
- - task: MicroBuildSigningPlugin@4
- displayName: Install MicroBuild plugin (Windows)
- inputs:
- signType: $(_SignType)
- zipSources: false
- feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
- ${{ if eq(parameters.microbuildUseESRP, true) }}:
- ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)'
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
- ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
- ${{ else }}:
- ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
- env:
- TeamName: $(_TeamName)
- MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
- SYSTEM_ACCESSTOKEN: $(System.AccessToken)
- continueOnError: ${{ parameters.continueOnError }}
- condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
-
- - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}:
- - task: MicroBuildSigningPlugin@4
- displayName: Install MicroBuild plugin (non-Windows)
- inputs:
+ - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self
+ parameters:
+ enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
+ microbuildTaskInputs:
signType: $(_SignType)
zipSources: false
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
+ version: ${{ parameters.microbuildPluginVersion }}
${{ if eq(parameters.microbuildUseESRP, true) }}:
ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)'
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
- ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39
+ ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
${{ else }}:
- ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
- env:
+ ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
+ microbuildEnv:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
- condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))
+ condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
+
+ - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}:
+ - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self
+ parameters:
+ enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
+ microbuildTaskInputs:
+ signType: $(_SignType)
+ zipSources: false
+ feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
+ version: ${{ parameters.microbuildPluginVersion }}
+ ${{ if eq(parameters.microbuildUseESRP, true) }}:
+ ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)'
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39
+ ${{ else }}:
+ ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
+ microbuildEnv:
+ TeamName: $(_TeamName)
+ MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
+ SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+ continueOnError: ${{ parameters.continueOnError }}
+ condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))
diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml
index e9a694afa58e..eff4573c6e5f 100644
--- a/eng/common/core-templates/steps/source-index-stage1-publish.yml
+++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml
@@ -1,6 +1,6 @@
parameters:
- sourceIndexUploadPackageVersion: 2.0.0-20250818.1
- sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1
+ sourceIndexUploadPackageVersion: 2.0.0-20250906.1
+ sourceIndexProcessBinlogPackageVersion: 1.0.1-20250906.1
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
binlogPath: artifacts/log/Debug/Build.binlog
diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh
index e889f439b8dc..9f5ad6b763b5 100644
--- a/eng/common/darc-init.sh
+++ b/eng/common/darc-init.sh
@@ -5,7 +5,7 @@ darcVersion=''
versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20'
verbosity='minimal'
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
case "$opt" in
--darcversion)
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
index 7b9d97e3bd4d..61f302bb6775 100644
--- a/eng/common/dotnet-install.sh
+++ b/eng/common/dotnet-install.sh
@@ -18,7 +18,7 @@ architecture=''
runtime='dotnet'
runtimeSourceFeed=''
runtimeSourceFeedKey=''
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
case "$opt" in
-version|-v)
diff --git a/eng/common/dotnet.sh b/eng/common/dotnet.sh
index 2ef68235675f..f6d24871c1d4 100644
--- a/eng/common/dotnet.sh
+++ b/eng/common/dotnet.sh
@@ -19,7 +19,7 @@ source $scriptroot/tools.sh
InitializeDotNetCli true # install
# Invoke acquired SDK with args if they are provided
-if [[ $# > 0 ]]; then
+if [[ $# -gt 0 ]]; then
__dotnetDir=${_InitializeDotNetCli}
dotnetPath=${__dotnetDir}/dotnet
${dotnetPath} "$@"
diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh
index 9378223ba095..6299e7effd4c 100644
--- a/eng/common/internal-feed-operations.sh
+++ b/eng/common/internal-feed-operations.sh
@@ -100,7 +100,7 @@ operation=''
authToken=''
repoName=''
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
case "$opt" in
--operation)
diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh
index 477a44f335be..f7bd4af0c8db 100644
--- a/eng/common/native/install-dependencies.sh
+++ b/eng/common/native/install-dependencies.sh
@@ -30,6 +30,8 @@ case "$os" in
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then
pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
$pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
+ elif [ "$ID" = "amzn" ]; then
+ dnf install -y cmake llvm lld lldb clang python libicu-devel openssl-devel krb5-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 openssl-dev pigz cpio
else
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index b62e132d32a4..4655af7a2d88 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -68,7 +68,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.13.0" -MemberType NoteProperty
+ $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 06b44de78709..4bc50bd568ca 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -394,8 +394,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.13.0
- $defaultXCopyMSBuildVersion = '17.13.0'
+ # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16
+ $defaultXCopyMSBuildVersion = '17.14.16'
if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
diff --git a/global.json b/global.json
index a44ffd67fd17..e43b7ce2bd2f 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "10.0.100-rtm.25507.103",
+ "version": "10.0.100-rc.2.25508.109",
"paths": [
"builds/downloads/dotnet",
"$host$"
@@ -8,9 +8,9 @@
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
- "dotnet": "10.0.100-rtm.25507.103"
+ "dotnet": "10.0.100-rc.2.25508.109"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25507.103"
+ "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25508.109"
}
}
diff --git a/scripts/generate-workloadmanifest-json/generate-workloadmanifest-json.cs b/scripts/generate-workloadmanifest-json/generate-workloadmanifest-json.cs
index 5c2ec4100f76..95b984ee43b4 100755
--- a/scripts/generate-workloadmanifest-json/generate-workloadmanifest-json.cs
+++ b/scripts/generate-workloadmanifest-json/generate-workloadmanifest-json.cs
@@ -76,12 +76,18 @@
writer.WriteLine ($" \"extends\": [");
if (platform == "macOS") {
writer.WriteLine ($" \"microsoft-net-runtime-mono-tooling\",");
- for (var i = earliestDotNetVersion; i < latestDotNetVersion; i++)
+ for (var i = earliestDotNetVersion; i < latestDotNetVersion; i++) {
+ if (i == 10)
+ continue; // temporary? there doesn't seem to be a microsoft-net-runtime-mono-tooling-net10 yet, so this will likely have to be removed once it's created
writer.WriteLine ($" \"microsoft-net-runtime-mono-tooling-net{i}\",");
+ }
} else {
writer.WriteLine ($" \"microsoft-net-runtime-{platformLowerCase}\",");
- for (var i = earliestDotNetVersion; i < latestDotNetVersion; i++)
+ for (var i = earliestDotNetVersion; i < latestDotNetVersion; i++) {
+ if (i == 10)
+ continue; // temporary? there doesn't seem to be a microsoft-net-runtime-mono-tooling-net10 yet, so this will likely have to be removed once it's created
writer.WriteLine ($" \"microsoft-net-runtime-{platformLowerCase}-net{i}\",");
+ }
}
writer.WriteLine ($" ]");
writer.WriteLine ($" }},");
diff --git a/src/FSKit/FSKitFunctions.cs b/src/FSKit/FSKitFunctions.cs
index 689124801b27..a617206cec5c 100644
--- a/src/FSKit/FSKitFunctions.cs
+++ b/src/FSKit/FSKitFunctions.cs
@@ -1,6 +1,12 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
+// Let's hope that by .NET 11 we've ironed out all the bugs in the API.
+// This can of course be adjusted as needed (until we've released as stable).
+#if NET11_0_OR_GREATER
+#define STABLE_FSKIT
+#endif
+
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
@@ -9,12 +15,6 @@
#nullable enable
-// Let's hope that by .NET 11 we've ironed out all the bugs in the API.
-// This can of course be adjusted as needed (until we've released as stable).
-#if NET11_0_OR_GREATER
-#define STABLE_FSKIT
-#endif
-
namespace FSKit {
#if !STABLE_FSKIT
[Experimental ("APL0002")]
diff --git a/src/fskit.cs b/src/fskit.cs
index 6f4069c778e7..3e30f30a64e6 100644
--- a/src/fskit.cs
+++ b/src/fskit.cs
@@ -1,6 +1,12 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
+// Let's hope that by .NET 11 we've ironed out all the bugs in the API.
+// This can of course be adjusted as needed (until we've released as stable).
+#if NET11_0_OR_GREATER
+#define STABLE_FSKIT
+#endif
+
using System;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
@@ -10,12 +16,6 @@
using Foundation;
using ObjCRuntime;
-// Let's hope that by .NET 11 we've ironed out all the bugs in the API.
-// This can of course be adjusted as needed (until we've released as stable).
-#if NET11_0_OR_GREATER
-#define STABLE_FSKIT
-#endif
-
using FSDirectoryCookie = System.UInt64;
using FSDirectoryVerifier = System.UInt64;
using FSOperationId = System.UIntPtr; // typedef NSUInteger FSOperationID
diff --git a/tools/common/SdkVersions.cs b/tools/common/SdkVersions.cs
index 83704e21eb0f..23523cdd8d30 100644
--- a/tools/common/SdkVersions.cs
+++ b/tools/common/SdkVersions.cs
@@ -132,7 +132,7 @@ public static Version GetMinVersion (ApplePlatform platform)
}
static class DotNetVersions {
- public const string Tfm = "net10.0";
- public const string Version = "10.0";
+ public const string Tfm = "net11.0";
+ public const string Version = "11.0";
}
}
diff --git a/tools/dotnet-linker/Makefile b/tools/dotnet-linker/Makefile
index 6dfb76a3899f..74f0da344f60 100644
--- a/tools/dotnet-linker/Makefile
+++ b/tools/dotnet-linker/Makefile
@@ -3,7 +3,7 @@ TOP=../..
include $(TOP)/Make.config
include $(TOP)/mk/rules.mk
-BUILD_DIR=bin/Debug/$(DOTNET_TFM)
+BUILD_DIR=bin/Debug
DOTNET_TARGETS += \
$(BUILD_DIR)/dotnet-linker.dll \
diff --git a/tools/dotnet-linker/dotnet-linker.csproj b/tools/dotnet-linker/dotnet-linker.csproj
index d7ac97df6480..4e3d42ce0af0 100644
--- a/tools/dotnet-linker/dotnet-linker.csproj
+++ b/tools/dotnet-linker/dotnet-linker.csproj
@@ -5,6 +5,7 @@
$(DefineConstants);BUNDLER
true
nullable
+ false