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
3 changes: 1 addition & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-android -->
<add key="darc-pub-dotnet-android-be1cab9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-be1cab92/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-android -->
<!-- Begin: Package sources from dotnet-macios -->
<add key="darc-pub-dotnet-macios-8071534" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-80715342/nuget/v3/index.json" />
<add key="darc-pub-dotnet-macios-af20d0b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-af20d0b6/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-macios -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="local" value="LOCAL_PLACEHOLDER" />
Expand Down
176 changes: 88 additions & 88 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

84 changes: 42 additions & 42 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -30,41 +30,41 @@
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>9.0.82</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>10.0.100-preview.7.25380.108</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rc.1.25413.112</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.7.25380.108</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25413.112</MicrosoftNETCoreAppRefPackageVersion>
<SystemTextJsonPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextJsonPackageVersion>
<SystemTextEncodingsWebPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextEncodingsWebPackageVersion>
<MicrosoftBclAsyncInterfacesPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftBclAsyncInterfacesPackageVersion>
<!-- Microsoft/Extensions -->
<SystemCodeDomPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemCodeDomPackageVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsPrimitivesVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-rc.1.25413.112</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-rc.1.25413.112</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-rc.1.25413.112</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-rc.1.25413.112</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-rc.1.25413.112</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-rc.1.25413.112</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-rc.1.25413.112</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-rc.1.25413.112</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-rc.1.25413.112</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-rc.1.25413.112</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsPrimitivesVersion>10.0.0-rc.1.25413.112</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-rc.1.25413.112</MicrosoftExtensionsHostingAbstractionsVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>36.0.0-preview.7.229</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>36.0.0-ci.main.271</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.92</MicrosoftNETSdkAndroidManifest90100PackageVersion>
<AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</AndroidNetPreviousVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdknet100_185PackageVersion>18.5.10603-net10-p7</MicrosoftMacCatalystSdknet100_185PackageVersion>
<MicrosoftmacOSSdknet100_155PackageVersion>15.5.10603-net10-p7</MicrosoftmacOSSdknet100_155PackageVersion>
<MicrosoftiOSSdknet100_185PackageVersion>18.5.10603-net10-p7</MicrosoftiOSSdknet100_185PackageVersion>
<MicrosofttvOSSdknet100_185PackageVersion>18.5.10603-net10-p7</MicrosofttvOSSdknet100_185PackageVersion>
<MicrosoftMacCatalystSdknet100_185PackageVersion>18.5.10719-net10-rc.1</MicrosoftMacCatalystSdknet100_185PackageVersion>
<MicrosoftmacOSSdknet100_155PackageVersion>15.5.10719-net10-rc.1</MicrosoftmacOSSdknet100_155PackageVersion>
<MicrosoftiOSSdknet100_185PackageVersion>18.5.10719-net10-rc.1</MicrosoftiOSSdknet100_185PackageVersion>
<MicrosofttvOSSdknet100_185PackageVersion>18.5.10719-net10-rc.1</MicrosofttvOSSdknet100_185PackageVersion>
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
<MicrosoftMacCatalystSdknet90_185PackageVersion>18.5.9215</MicrosoftMacCatalystSdknet90_185PackageVersion>
<MicrosoftmacOSSdknet90_155PackageVersion>15.5.9215</MicrosoftmacOSSdknet90_155PackageVersion>
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9215</MicrosoftiOSSdknet90_185PackageVersion>
<MicrosofttvOSSdknet90_185PackageVersion>18.5.9215</MicrosofttvOSSdknet90_185PackageVersion>
<MicrosoftMacCatalystSdknet90_185PackageVersion>18.5.9216</MicrosoftMacCatalystSdknet90_185PackageVersion>
<MicrosoftmacOSSdknet90_155PackageVersion>15.5.9216</MicrosoftmacOSSdknet90_155PackageVersion>
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9216</MicrosoftiOSSdknet90_185PackageVersion>
<MicrosofttvOSSdknet90_185PackageVersion>18.5.9216</MicrosofttvOSSdknet90_185PackageVersion>
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
<!-- wasdk -->
Expand All @@ -73,19 +73,19 @@
<MicrosoftGraphicsWin2DPackageVersion>1.3.2</MicrosoftGraphicsWin2DPackageVersion>
<MicrosoftWindowsWebView2PackageVersion>1.0.3179.45</MicrosoftWindowsWebView2PackageVersion>
<!-- Everything else -->
<MicrosoftAspNetCoreAuthorizationPackageVersion>10.0.0-preview.7.25380.108</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>10.0.0-preview.7.25380.108</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>10.0.0-preview.7.25380.108</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>10.0.0-preview.7.25380.108</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>10.0.0-preview.7.25380.108</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreComponentsFormsPackageVersion>10.0.0-preview.7.25380.108</MicrosoftAspNetCoreComponentsFormsPackageVersion>
<MicrosoftAspNetCoreComponentsPackageVersion>10.0.0-preview.7.25380.108</MicrosoftAspNetCoreComponentsPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>10.0.0-preview.7.25380.108</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>10.0.0-preview.7.25380.108</MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>10.0.0-preview.7.25380.108</MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>10.0.0-preview.7.25380.108</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreMetadataPackageVersion>10.0.0-preview.7.25380.108</MicrosoftAspNetCoreMetadataPackageVersion>
<MicrosoftJSInteropPackageVersion>10.0.0-preview.7.25380.108</MicrosoftJSInteropPackageVersion>
<MicrosoftAspNetCoreAuthorizationPackageVersion>10.0.0-rc.1.25413.112</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>10.0.0-rc.1.25413.112</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>10.0.0-rc.1.25413.112</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>10.0.0-rc.1.25413.112</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>10.0.0-rc.1.25413.112</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreComponentsFormsPackageVersion>10.0.0-rc.1.25413.112</MicrosoftAspNetCoreComponentsFormsPackageVersion>
<MicrosoftAspNetCoreComponentsPackageVersion>10.0.0-rc.1.25413.112</MicrosoftAspNetCoreComponentsPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>10.0.0-rc.1.25413.112</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>10.0.0-rc.1.25413.112</MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>10.0.0-rc.1.25413.112</MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>10.0.0-rc.1.25413.112</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreMetadataPackageVersion>10.0.0-rc.1.25413.112</MicrosoftAspNetCoreMetadataPackageVersion>
<MicrosoftJSInteropPackageVersion>10.0.0-rc.1.25413.112</MicrosoftJSInteropPackageVersion>
<!-- Everything else (previous edition) -->
<MicrosoftAspNetCorePackageVersion>8.0.16</MicrosoftAspNetCorePackageVersion>
<MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>$(MicrosoftAspNetCorePackageVersion)</MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>
Expand Down Expand Up @@ -142,13 +142,13 @@
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
<ExCSSPackageVersion>4.2.3</ExCSSPackageVersion>
<SystemDrawingCommonPackageVersion>9.0.0</SystemDrawingCommonPackageVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25380.108</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25380.108</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25380.108</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25380.108</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25413.112</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25413.112</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25413.112</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25413.112</MicrosoftDotNetHelixSdkPackageVersion>
<MicroBuildPluginsSwixBuildDotnetPackageVersion>1.1.87-gba258badda</MicroBuildPluginsSwixBuildDotnetPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25380.108</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25380.108</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25413.112</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25413.112</MicrosoftDotNetXUnitExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETTestSdkPackageVersion>17.6.0</MicrosoftNETTestSdkPackageVersion>
Expand Down
2 changes: 2 additions & 0 deletions eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ parameters:
artifacts: ''
enableMicrobuild: false
enableMicrobuildForMacAndLinux: false
microbuildUseESRP: true
enablePublishBuildArtifacts: false
enablePublishBuildAssets: false
enablePublishTestResults: false
Expand Down Expand Up @@ -128,6 +129,7 @@ jobs:
parameters:
enableMicrobuild: ${{ parameters.enableMicrobuild }}
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
continueOnError: ${{ parameters.continueOnError }}

- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
Expand Down
30 changes: 14 additions & 16 deletions eng/common/core-templates/job/onelocbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:

# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
pool: ''

CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)

Expand All @@ -27,7 +27,7 @@ parameters:
is1ESPipeline: ''
jobs:
- job: OneLocBuild${{ parameters.JobNameSuffix }}

dependsOn: ${{ parameters.dependsOn }}

displayName: OneLocBuild${{ parameters.JobNameSuffix }}
Expand Down Expand Up @@ -99,22 +99,20 @@ jobs:
mirrorBranch: ${{ parameters.MirrorBranch }}
condition: ${{ parameters.condition }}

- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
args:
displayName: Publish Localization Files
pathToPublish: '$(Build.ArtifactStagingDirectory)/loc'
publishLocation: Container
artifactName: Loc
condition: ${{ parameters.condition }}
# Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact
- task: CopyFiles@2
displayName: Copy LocProject.json
inputs:
SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/'
Contents: 'LocProject.json'
TargetFolder: '$(Build.ArtifactStagingDirectory)/loc'
condition: ${{ parameters.condition }}

- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
args:
displayName: Publish LocProject.json
pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/'
publishLocation: Container
artifactName: Loc
targetPath: '$(Build.ArtifactStagingDirectory)/loc'
artifactName: 'Loc'
displayName: 'Publish Localization Files'
condition: ${{ parameters.condition }}
3 changes: 0 additions & 3 deletions eng/common/core-templates/jobs/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ jobs:
- template: /eng/common/core-templates/jobs/source-build.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
allCompletedJobId: Source_Build_Complete
${{ each parameter in parameters.sourceBuildParameters }}:
${{ parameter.key }}: ${{ parameter.value }}

Expand All @@ -108,8 +107,6 @@ jobs:
- ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}:
- ${{ each job in parameters.jobs }}:
- ${{ job.job }}
- ${{ if eq(parameters.enableSourceBuild, true) }}:
- Source_Build_Complete

runAsPublic: ${{ parameters.runAsPublic }}
publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }}
Expand Down
16 changes: 0 additions & 16 deletions eng/common/core-templates/jobs/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ parameters:
# This template adds arcade-powered source-build to CI. A job is created for each platform, as
# well as an optional server job that completes when all platform jobs complete.

# The name of the "join" job for all source-build platforms. If set to empty string, the job is
# not included. Existing repo pipelines can use this job depend on all source-build jobs
# completing without maintaining a separate list of every single job ID: just depend on this one
# server job. By default, not included. Recommended name if used: 'Source_Build_Complete'.
allCompletedJobId: ''

# See /eng/common/core-templates/job/source-build.yml
jobNamePrefix: 'Source_Build'

Expand All @@ -31,16 +25,6 @@ parameters:

jobs:

- ${{ if ne(parameters.allCompletedJobId, '') }}:
- job: ${{ parameters.allCompletedJobId }}
displayName: Source-Build Complete
pool: server
dependsOn:
- ${{ each platform in parameters.platforms }}:
- ${{ parameters.jobNamePrefix }}_${{ platform.name }}
- ${{ if eq(length(parameters.platforms), 0) }}:
- ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }}

- ${{ each platform in parameters.platforms }}:
- template: /eng/common/core-templates/job/source-build.yml
parameters:
Expand Down
Loading
Loading