Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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: 3 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-43556b3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-43556b39/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-macios -->
<add key="darc-pub-dotnet-macios-4681bf9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4681bf92/nuget/v3/index.json" />
<add key="darc-pub-dotnet-macios-4681bf9-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4681bf92-1/nuget/v3/index.json" />
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25512.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25512.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25512.102</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25512.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.0-rtm.25512.102</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-rtm.25512.102</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0-rtm.25512.102</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rtm.25512.102</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rtm.25512.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-rtm.25512.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25514.111</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25514.111</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25514.111</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25514.111</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.0-rtm.25514.111</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rtm.25514.111</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/macios dependencies -->
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
<MicrosoftiOSSdknet90_260PackageVersion>26.0.9754</MicrosoftiOSSdknet90_260PackageVersion>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rtm.25512.102">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rtm.25514.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
<Sha>43556b39d4b9cba30c460112a687b7aba6d9fe5d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rtm.25512.102">
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rtm.25514.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
<Sha>43556b39d4b9cba30c460112a687b7aba6d9fe5d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-rtm.25512.102">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
<Sha>43556b39d4b9cba30c460112a687b7aba6d9fe5d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0-rtm.25512.102">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
<Sha>43556b39d4b9cba30c460112a687b7aba6d9fe5d</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rtm.25512.102">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
<Sha>43556b39d4b9cba30c460112a687b7aba6d9fe5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25512.102">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25514.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
<Sha>43556b39d4b9cba30c460112a687b7aba6d9fe5d</Sha>
</Dependency>
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.5" Version="18.5.9227">
Expand Down Expand Up @@ -78,25 +78,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25512.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25514.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
<Sha>43556b39d4b9cba30c460112a687b7aba6d9fe5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25512.102">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25514.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
<Sha>43556b39d4b9cba30c460112a687b7aba6d9fe5d</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-rtm.25512.102">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
<Sha>43556b39d4b9cba30c460112a687b7aba6d9fe5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25466.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>cbaa911ef1bce4cf92a7e4f7ffa5171eddd1a8fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25512.102">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25514.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
<Sha>43556b39d4b9cba30c460112a687b7aba6d9fe5d</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
6 changes: 2 additions & 4 deletions eng/common/SetupNugetSources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,8 @@ EnableInternalPackageSource() {
grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
if [ "$?" == "0" ]; then
echo "Enabling internal source '$PackageSourceName'."
# Remove the disabled entry
local OldDisableValue="<add key=\"$PackageSourceName\" value=\"true\" />"
local NewDisableValue="<!-- Reenabled for build : $PackageSourceName -->"
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile"
# Remove the disabled entry (including any surrounding comments or whitespace on the same line)
sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"

# Add the source name to PackageSources for credential handling
PackageSources+=("$PackageSourceName")
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "10.0.100-rtm.25512.102",
"version": "10.0.100-rtm.25514.111",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "10.0.100-rtm.25512.102"
"dotnet": "10.0.100-rtm.25514.111"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25512.102"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25514.111"
}
}
Loading