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
160 changes: 80 additions & 80 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

76 changes: 38 additions & 38 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -30,36 +30,36 @@
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>9.0.51</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>10.0.100-preview.6.25358.103</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-preview.7.25364.110</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.6.25358.103</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.7.25364.110</MicrosoftNETCoreAppRefPackageVersion>
<SystemTextJsonPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextJsonPackageVersion>
<SystemTextEncodingsWebPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextEncodingsWebPackageVersion>
<MicrosoftBclAsyncInterfacesPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftBclAsyncInterfacesPackageVersion>
<!-- Microsoft/Extensions -->
<SystemCodeDomPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemCodeDomPackageVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.6.25358.103</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.6.25358.103</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.6.25358.103</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.6.25358.103</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-preview.6.25358.103</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-preview.6.25358.103</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-preview.6.25358.103</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.6.25358.103</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-preview.6.25358.103</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-preview.6.25358.103</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsPrimitivesVersion>10.0.0-preview.6.25358.103</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-preview.6.25358.103</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25364.110</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25364.110</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25364.110</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25364.110</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-preview.7.25364.110</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-preview.7.25364.110</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-preview.7.25364.110</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25364.110</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-preview.7.25364.110</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-preview.7.25364.110</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsPrimitivesVersion>10.0.0-preview.7.25364.110</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-preview.7.25364.110</MicrosoftExtensionsHostingAbstractionsVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>36.0.0-preview.6.169</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>36.0.0-ci.main.206</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.78</MicrosoftNETSdkAndroidManifest90100PackageVersion>
<AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</AndroidNetPreviousVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdknet100_185PackageVersion>18.5.10415-net10-p6</MicrosoftMacCatalystSdknet100_185PackageVersion>
<MicrosoftmacOSSdknet100_155PackageVersion>15.5.10415-net10-p6</MicrosoftmacOSSdknet100_155PackageVersion>
<MicrosoftiOSSdknet100_185PackageVersion>18.5.10415-net10-p6</MicrosoftiOSSdknet100_185PackageVersion>
<MicrosofttvOSSdknet100_185PackageVersion>18.5.10415-net10-p6</MicrosofttvOSSdknet100_185PackageVersion>
<MicrosoftMacCatalystSdknet100_185PackageVersion>18.5.10546-net10-p7</MicrosoftMacCatalystSdknet100_185PackageVersion>
<MicrosoftmacOSSdknet100_155PackageVersion>15.5.10546-net10-p7</MicrosoftmacOSSdknet100_155PackageVersion>
<MicrosoftiOSSdknet100_185PackageVersion>18.5.10546-net10-p7</MicrosoftiOSSdknet100_185PackageVersion>
<MicrosofttvOSSdknet100_185PackageVersion>18.5.10546-net10-p7</MicrosofttvOSSdknet100_185PackageVersion>
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
<!-- wasdk -->
Expand All @@ -68,19 +68,19 @@
<MicrosoftGraphicsWin2DPackageVersion>1.3.2</MicrosoftGraphicsWin2DPackageVersion>
<MicrosoftWindowsWebView2PackageVersion>1.0.3179.45</MicrosoftWindowsWebView2PackageVersion>
<!-- Everything else -->
<MicrosoftAspNetCoreAuthorizationPackageVersion>10.0.0-preview.6.25358.103</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>10.0.0-preview.6.25358.103</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>10.0.0-preview.6.25358.103</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>10.0.0-preview.6.25358.103</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>10.0.0-preview.6.25358.103</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreComponentsFormsPackageVersion>10.0.0-preview.6.25358.103</MicrosoftAspNetCoreComponentsFormsPackageVersion>
<MicrosoftAspNetCoreComponentsPackageVersion>10.0.0-preview.6.25358.103</MicrosoftAspNetCoreComponentsPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>10.0.0-preview.6.25358.103</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>10.0.0-preview.6.25358.103</MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>10.0.0-preview.6.25358.103</MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>10.0.0-preview.6.25358.103</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreMetadataPackageVersion>10.0.0-preview.6.25358.103</MicrosoftAspNetCoreMetadataPackageVersion>
<MicrosoftJSInteropPackageVersion>10.0.0-preview.6.25358.103</MicrosoftJSInteropPackageVersion>
<MicrosoftAspNetCoreAuthorizationPackageVersion>10.0.0-preview.7.25364.110</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>10.0.0-preview.7.25364.110</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>10.0.0-preview.7.25364.110</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>10.0.0-preview.7.25364.110</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>10.0.0-preview.7.25364.110</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreComponentsFormsPackageVersion>10.0.0-preview.7.25364.110</MicrosoftAspNetCoreComponentsFormsPackageVersion>
<MicrosoftAspNetCoreComponentsPackageVersion>10.0.0-preview.7.25364.110</MicrosoftAspNetCoreComponentsPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>10.0.0-preview.7.25364.110</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>10.0.0-preview.7.25364.110</MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>10.0.0-preview.7.25364.110</MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>10.0.0-preview.7.25364.110</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreMetadataPackageVersion>10.0.0-preview.7.25364.110</MicrosoftAspNetCoreMetadataPackageVersion>
<MicrosoftJSInteropPackageVersion>10.0.0-preview.7.25364.110</MicrosoftJSInteropPackageVersion>
<!-- Everything else (previous edition) -->
<MicrosoftAspNetCorePackageVersion>8.0.16</MicrosoftAspNetCorePackageVersion>
<MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>$(MicrosoftAspNetCorePackageVersion)</MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>
Expand Down Expand Up @@ -136,13 +136,13 @@
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
<ExCSSPackageVersion>4.2.3</ExCSSPackageVersion>
<SystemDrawingCommonPackageVersion>9.0.0</SystemDrawingCommonPackageVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25358.103</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25358.103</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25358.103</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25358.103</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25364.110</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25364.110</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25364.110</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25364.110</MicrosoftDotNetHelixSdkPackageVersion>
<MicroBuildPluginsSwixBuildDotnetPackageVersion>1.1.87-gba258badda</MicroBuildPluginsSwixBuildDotnetPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25358.103</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25358.103</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25364.110</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25364.110</MicrosoftDotNetXUnitExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETTestSdkPackageVersion>17.6.0</MicrosoftNETTestSdkPackageVersion>
Expand Down
8 changes: 4 additions & 4 deletions eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
@@ -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: ''
Expand All @@ -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: ''
Expand All @@ -33,7 +33,7 @@ parameters:
artifactPublishSteps: []
runAsPublic: false

# 1es specific parameters
# 1es specific parameters
is1ESPipeline: ''

jobs:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions eng/common/core-templates/steps/install-microbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 0 additions & 6 deletions eng/common/core-templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand All @@ -55,7 +50,6 @@ steps:
${{ parameters.platform.buildArguments }} \
$internalRuntimeDownloadArgs \
$targetRidArgs \
$baseRidArgs \
$portableBuildArgs \
displayName: Build

Expand Down
18 changes: 18 additions & 0 deletions eng/common/templates/vmr-build-pr.yml
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Essentials/src/Gyroscope/Gyroscope.ios.watchos.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading