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 Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<PackageVersion Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />

<!-- build dependencies-->
<PackageVersion Include="Microsoft.Build.Locator" Version="1.9.1" />
<PackageVersion Include="Microsoft.Build.Locator" Version="1.10.2" />
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<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-03ebd38" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-03ebd38e/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-d499f9c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-d499f9cd/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
Expand Down
10 changes: 5 additions & 5 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25515.107</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25515.107</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25515.107</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25519.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25519.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25519.102</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rtm.25515.107</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rtm.25519.102</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25515.107</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25519.102</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.0</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0</SystemTextEncodingsWebPackageVersion>
Expand Down
48 changes: 24 additions & 24 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,80 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="03ebd38e3fd6b1068f44b5e4c560ad891c2b412e" BarId="287340" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="d499f9cdfd5b7b7bb291f95a3c14417d5edc969f" BarId="287756" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rtm.25515.107">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rtm.25519.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25515.107">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25519.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25515.107">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25519.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25515.107">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25519.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25515.107">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25519.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>d499f9cdfd5b7b7bb291f95a3c14417d5edc969f</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</PropertyGroup>
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(IsServicingBuild)' != 'true'">
<!-- For MSBuild and Roslyn packages use the previous stable version until the current stable build is released. -->
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.14.8</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildTasksCoreVersion>17.14.8</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildFrameworkVersion>17.14.28</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.14.28</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildTasksCoreVersion>17.14.28</MicrosoftBuildTasksCoreVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.14.0</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.14.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>4.14.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.107",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.107"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25519.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25519.102"
}
}
Loading