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
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<add key="darc-pub-dotnet-android-68aebb0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-68aebb0a/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-android -->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-5aef8ea" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-5aef8eac/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-7b29526" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-7b29526f/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-macios -->
<add key="darc-pub-dotnet-macios-aecad73" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-aecad730/nuget/v3/index.json" />
Expand Down
88 changes: 44 additions & 44 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rtm.25520.105">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rtm.25523.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="36.0.16">
<Uri>https://github.com/dotnet/android</Uri>
Expand Down Expand Up @@ -56,107 +56,107 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authentication.Facebook" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authentication.Google" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Forms" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Metadata" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.JSInterop" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Tasks" Version="7.0.100-preview.2.22102.8">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Primitives" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="10.0.0-prerelease.25506.2">
<Uri>https://github.com/dotnet/xharness</Uri>
Expand All @@ -172,37 +172,37 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25520.105">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25523.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25520.105">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25523.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25520.105">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25523.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25520.105">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25523.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25520.105">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25523.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25520.105">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25523.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25520.105">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25523.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25520.105">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25523.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<Sha>7b29526f2107416f68578bcb9deaca74fcfcf7f0</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
14 changes: 7 additions & 7 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>9.0.111</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>10.0.100-rtm.25520.105</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rtm.25523.113</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MonoPackageVersion>10.0.100</MonoPackageVersion>
<!-- dotnet/runtime -->
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.25520.105</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25520.105</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25520.105</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25520.105</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25523.113</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25523.113</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25523.113</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25523.113</MicrosoftDotNetHelixSdkPackageVersion>
<MicroBuildPluginsSwixBuildDotnetPackageVersion>1.1.87-gba258badda</MicroBuildPluginsSwixBuildDotnetPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25520.105</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25520.105</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25523.113</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25523.113</MicrosoftDotNetXUnitExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETTestSdkPackageVersion>17.6.0</MicrosoftNETTestSdkPackageVersion>
Expand Down
4 changes: 0 additions & 4 deletions eng/common/core-templates/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ parameters:
# container and pool.
platform: {}

# Optional list of directories to ignore for component governance scans.
componentGovernanceIgnoreDirectories: []

is1ESPipeline: ''

# If set to true and running on a non-public project,
Expand Down Expand Up @@ -97,4 +94,3 @@ jobs:
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
platform: ${{ parameters.platform }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
5 changes: 0 additions & 5 deletions eng/common/core-templates/jobs/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ parameters:
# one job runs on 'defaultManagedPlatform'.
platforms: []

# Optional list of directories to ignore for component governance scans.
componentGovernanceIgnoreDirectories: []

is1ESPipeline: ''

# If set to true and running on a non-public project,
Expand All @@ -34,7 +31,6 @@ jobs:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ platform }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}

- ${{ if eq(length(parameters.platforms), 0) }}:
Expand All @@ -43,5 +39,4 @@ jobs:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ parameters.defaultManagedPlatform }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}
1 change: 0 additions & 1 deletion eng/common/core-templates/steps/get-delegation-sas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ steps:
inputs:
azureSubscription: ${{ parameters.federatedServiceConnection }}
scriptType: 'pscore'
addSpnToEnvironment: true
scriptLocation: 'inlineScript'
inlineScript: |
# Calculate the expiration of the SAS token and convert to UTC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ steps:
inputs:
azureSubscription: ${{ parameters.federatedServiceConnection }}
scriptType: 'pscore'
addSpnToEnvironment: true
scriptLocation: 'inlineScript'
inlineScript: |
$accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.44",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25520.105",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25520.105"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25523.113",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25523.113"
},
"sdk": {
"allowPrerelease": true
Expand Down