diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1f7cfc9f7586..a6e06aba3f4f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,144 +1,144 @@
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/android
- a526dd5da85cf1d231c0b719550ecbf9b446c6f7
+ 1fe4229b4fd76ca608229b64ac0bf97d90646ef1
https://github.com/dotnet/android
9abff7703206541fdb83ffa80fe2c2753ad1997b
-
+
https://github.com/dotnet/macios
- 96ea7cf2db5943ee8dc6c5cf572db03edebd6a90
+ a1ff6354a74138da50850624e3fab0fac3ab16d5
-
+
https://github.com/dotnet/macios
- 96ea7cf2db5943ee8dc6c5cf572db03edebd6a90
+ a1ff6354a74138da50850624e3fab0fac3ab16d5
-
+
https://github.com/dotnet/macios
- 96ea7cf2db5943ee8dc6c5cf572db03edebd6a90
+ a1ff6354a74138da50850624e3fab0fac3ab16d5
-
+
https://github.com/dotnet/macios
- 96ea7cf2db5943ee8dc6c5cf572db03edebd6a90
+ a1ff6354a74138da50850624e3fab0fac3ab16d5
https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
https://github.com/dotnet/templating
3f4da9ced34942d83054e647f3b1d9d7dde281e8
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
https://github.com/dotnet/xharness
@@ -154,37 +154,37 @@
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
-
+
https://github.com/dotnet/dotnet
- 75972a5ba730bdaf7cf3a34f528ab0f5c7f05183
+ eceae8f6e934ad6a121e53f90a67f2aa3797af69
diff --git a/eng/Versions.props b/eng/Versions.props
index d0d399562942..1bac70e9ad83 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -30,36 +30,36 @@
9.0.51
- 10.0.100-preview.6.25358.103
+ 10.0.100-preview.7.25364.110
$(MicrosoftNETSdkPackageVersion)
- 10.0.0-preview.6.25358.103
+ 10.0.0-preview.7.25364.110
$(MicrosoftNETCoreAppRefPackageVersion)
$(MicrosoftNETCoreAppRefPackageVersion)
$(MicrosoftNETCoreAppRefPackageVersion)
$(MicrosoftNETCoreAppRefPackageVersion)
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
- 36.0.0-preview.6.169
+ 36.0.0-ci.main.206
35.0.78
$(MicrosoftNETSdkAndroidManifest90100PackageVersion)
- 18.5.10415-net10-p6
- 15.5.10415-net10-p6
- 18.5.10415-net10-p6
- 18.5.10415-net10-p6
+ 18.5.10546-net10-p7
+ 15.5.10546-net10-p7
+ 18.5.10546-net10-p7
+ 18.5.10546-net10-p7
8.0.148
@@ -68,19 +68,19 @@
1.3.2
1.0.3179.45
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
- 10.0.0-preview.6.25358.103
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
+ 10.0.0-preview.7.25364.110
8.0.16
$(MicrosoftAspNetCorePackageVersion)
@@ -136,13 +136,13 @@
0.9.0
4.2.3
9.0.0
- 10.0.0-beta.25358.103
- 10.0.0-beta.25358.103
- 10.0.0-beta.25358.103
- 10.0.0-beta.25358.103
+ 10.0.0-beta.25364.110
+ 10.0.0-beta.25364.110
+ 10.0.0-beta.25364.110
+ 10.0.0-beta.25364.110
1.1.87-gba258badda
- 10.0.0-beta.25358.103
- 10.0.0-beta.25358.103
+ 10.0.0-beta.25364.110
+ 10.0.0-beta.25364.110
17.6.0
diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml
index 90cefe90da05..6badecba7bcc 100644
--- a/eng/common/core-templates/job/job.yml
+++ b/eng/common/core-templates/job/job.yml
@@ -1,5 +1,5 @@
parameters:
- # Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
+# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
cancelTimeoutInMinutes: ''
condition: ''
container: ''
@@ -14,7 +14,7 @@ parameters:
workspace: ''
templateContext: {}
- # Job base template specific parameters
+# Job base template specific parameters
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
# publishing defaults
artifacts: ''
@@ -33,7 +33,7 @@ parameters:
artifactPublishSteps: []
runAsPublic: false
- # 1es specific parameters
+# 1es specific parameters
is1ESPipeline: ''
jobs:
@@ -202,7 +202,7 @@ jobs:
TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log'
continueOnError: true
condition: always()
-
+
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
- task: CopyFiles@2
displayName: Gather logs for publish to artifacts
diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml
index a3540ba00c7e..f3064a7834ed 100644
--- a/eng/common/core-templates/steps/install-microbuild.yml
+++ b/eng/common/core-templates/steps/install-microbuild.yml
@@ -30,6 +30,10 @@ steps:
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
useEsrpCli: true
+ ${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
+ ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
+ ${{ else }}:
+ ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml
index 0dde553c3ebf..acf16ed34963 100644
--- a/eng/common/core-templates/steps/source-build.yml
+++ b/eng/common/core-templates/steps/source-build.yml
@@ -38,11 +38,6 @@ steps:
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
fi
- baseRidArgs=
- if [ '${{ parameters.platform.baseRID }}' != '' ]; then
- baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}'
- fi
-
portableBuildArgs=
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
@@ -55,7 +50,6 @@ steps:
${{ parameters.platform.buildArguments }} \
$internalRuntimeDownloadArgs \
$targetRidArgs \
- $baseRidArgs \
$portableBuildArgs \
displayName: Build
diff --git a/eng/common/templates/vmr-build-pr.yml b/eng/common/templates/vmr-build-pr.yml
index c1b6fec45841..ce3c29a62faf 100644
--- a/eng/common/templates/vmr-build-pr.yml
+++ b/eng/common/templates/vmr-build-pr.yml
@@ -1,3 +1,21 @@
+# This pipeline is used for running the VMR verification of the PR changes in repo-level PRs.
+#
+# It will run a full set of verification jobs defined in:
+# https://github.com/dotnet/dotnet/blob/10060d128e3f470e77265f8490f5e4f72dae738e/eng/pipelines/templates/stages/vmr-build.yml#L27-L38
+#
+# For repos that do not need to run the full set, you would do the following:
+#
+# 1. Copy this YML file to a repo-specific location, i.e. outside of eng/common.
+#
+# 2. Add `verifications` parameter to VMR template reference
+#
+# Examples:
+# - For source-build stage 1 verification, add the following:
+# verifications: [ "source-build-stage1" ]
+#
+# - For Windows only verifications, add the following:
+# verifications: [ "unified-build-windows-x64", "unified-build-windows-x86" ]
+
trigger: none
pr: none
diff --git a/global.json b/global.json
index a676308d7535..5655930c6969 100644
--- a/global.json
+++ b/global.json
@@ -1,12 +1,12 @@
{
"tools": {
- "dotnet": "10.0.100-preview.6.25358.103"
+ "dotnet": "10.0.100-preview.7.25364.110"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.44",
"Microsoft.Build.NoTargets": "3.7.0",
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25358.103",
- "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25358.103"
+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25364.110",
+ "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25364.110"
},
"sdk": {
"allowPrerelease": true
diff --git a/src/Essentials/src/Accelerometer/Accelerometer.ios.watchos.cs b/src/Essentials/src/Accelerometer/Accelerometer.ios.watchos.cs
index 80a06dc5f37c..1651eec1bdc4 100644
--- a/src/Essentials/src/Accelerometer/Accelerometer.ios.watchos.cs
+++ b/src/Essentials/src/Accelerometer/Accelerometer.ios.watchos.cs
@@ -21,7 +21,7 @@ void PlatformStart(SensorSpeed sensorSpeed)
MotionManager.StartAccelerometerUpdates(NSOperationQueue.CurrentQueue ?? new NSOperationQueue(), DataUpdated);
}
- void DataUpdated(CMAccelerometerData data, NSError error)
+ void DataUpdated(CMAccelerometerData? data, NSError? error)
{
if (data == null)
return;
diff --git a/src/Essentials/src/Gyroscope/Gyroscope.ios.watchos.cs b/src/Essentials/src/Gyroscope/Gyroscope.ios.watchos.cs
index f9902849659f..e7c5181f3aba 100644
--- a/src/Essentials/src/Gyroscope/Gyroscope.ios.watchos.cs
+++ b/src/Essentials/src/Gyroscope/Gyroscope.ios.watchos.cs
@@ -21,7 +21,7 @@ void PlatformStart(SensorSpeed sensorSpeed)
MotionManager.StartGyroUpdates(NSOperationQueue.CurrentQueue ?? new NSOperationQueue(), DataUpdated);
}
- void DataUpdated(CMGyroData data, NSError error)
+ void DataUpdated(CMGyroData? data, NSError? error)
{
if (data == null)
return;
diff --git a/src/Essentials/src/Magnetometer/Magnetometer.ios.watchos.cs b/src/Essentials/src/Magnetometer/Magnetometer.ios.watchos.cs
index 865a99f0167a..d029fd7da871 100644
--- a/src/Essentials/src/Magnetometer/Magnetometer.ios.watchos.cs
+++ b/src/Essentials/src/Magnetometer/Magnetometer.ios.watchos.cs
@@ -21,7 +21,7 @@ void PlatformStart(SensorSpeed sensorSpeed)
MotionManager.StartMagnetometerUpdates(NSOperationQueue.CurrentQueue ?? new NSOperationQueue(), DataUpdated);
}
- void DataUpdated(CMMagnetometerData data, NSError error)
+ void DataUpdated(CMMagnetometerData? data, NSError? error)
{
if (data == null)
return;
diff --git a/src/Essentials/src/OrientationSensor/OrientationSensor.ios.watchos.cs b/src/Essentials/src/OrientationSensor/OrientationSensor.ios.watchos.cs
index ff48cf5267fd..5519c71a1cd5 100644
--- a/src/Essentials/src/OrientationSensor/OrientationSensor.ios.watchos.cs
+++ b/src/Essentials/src/OrientationSensor/OrientationSensor.ios.watchos.cs
@@ -25,7 +25,7 @@ void PlatformStart(SensorSpeed sensorSpeed)
MotionManager.StartDeviceMotionUpdates(CMAttitudeReferenceFrame.XTrueNorthZVertical, NSOperationQueue.CurrentQueue ?? new NSOperationQueue(), DataUpdated);
}
- void DataUpdated(CMDeviceMotion data, NSError error)
+ void DataUpdated(CMDeviceMotion? data, NSError? error)
{
if (data == null)
return;