diff --git a/eng/Version.Details.props b/eng/Version.Details.props index aa1fc141196d..0852ee929424 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -1 +1,241 @@ - + + + + + + 10.0.0-rc.1.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-beta.25377.103 + 10.0.0-beta.25377.103 + 10.0.0-beta.25377.103 + 10.0.0-beta.25377.103 + 10.0.0-beta.25377.103 + 10.0.0-beta.25377.103 + 10.0.0-beta.25377.103 + 10.0.0-rc.1.25377.103 + 10.0.0-rc.1.25377.103 + 10.0.0-rc.1.25377.103 + 10.0.0-rc.1.25377.103 + 10.0.0-rc.1.25377.103 + 10.0.0-rc.1.25377.103 + 10.0.0-rc.1.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 3.2.0-preview.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.7.25377.103 + + 4.13.0-3.24613.7 + 4.13.0-3.24613.7 + 4.13.0-3.24613.7 + 4.13.0-3.24613.7 + + 9.8.0-preview.1.25401.1 + 9.8.0-preview.1.25401.1 + 9.8.0-preview.1.25401.1 + + 1.0.0-prerelease.25374.3 + 1.0.0-prerelease.25374.3 + 1.0.0-prerelease.25374.3 + 1.0.0-prerelease.25374.3 + 1.0.0-prerelease.25374.3 + + 17.12.36 + 17.12.36 + 17.12.36 + 17.12.36 + + 6.2.4 + 6.2.4 + 6.2.4 + + + + + $(dotnetefPackageVersion) + $(MicrosoftBclAsyncInterfacesPackageVersion) + $(MicrosoftBclTimeProviderPackageVersion) + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksArchivesPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetRemoteExecutorPackageVersion) + $(MicrosoftDotNetSharedFrameworkSdkPackageVersion) + $(MicrosoftEntityFrameworkCorePackageVersion) + $(MicrosoftEntityFrameworkCoreDesignPackageVersion) + $(MicrosoftEntityFrameworkCoreInMemoryPackageVersion) + $(MicrosoftEntityFrameworkCoreRelationalPackageVersion) + $(MicrosoftEntityFrameworkCoreSqlitePackageVersion) + $(MicrosoftEntityFrameworkCoreSqlServerPackageVersion) + $(MicrosoftEntityFrameworkCoreToolsPackageVersion) + $(MicrosoftExtensionsCachingAbstractionsPackageVersion) + $(MicrosoftExtensionsCachingMemoryPackageVersion) + $(MicrosoftExtensionsConfigurationPackageVersion) + $(MicrosoftExtensionsConfigurationAbstractionsPackageVersion) + $(MicrosoftExtensionsConfigurationBinderPackageVersion) + $(MicrosoftExtensionsConfigurationCommandLinePackageVersion) + $(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion) + $(MicrosoftExtensionsConfigurationFileExtensionsPackageVersion) + $(MicrosoftExtensionsConfigurationIniPackageVersion) + $(MicrosoftExtensionsConfigurationJsonPackageVersion) + $(MicrosoftExtensionsConfigurationUserSecretsPackageVersion) + $(MicrosoftExtensionsConfigurationXmlPackageVersion) + $(MicrosoftExtensionsDependencyInjectionPackageVersion) + $(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion) + $(MicrosoftExtensionsDependencyModelPackageVersion) + $(MicrosoftExtensionsDiagnosticsPackageVersion) + $(MicrosoftExtensionsDiagnosticsAbstractionsPackageVersion) + $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) + $(MicrosoftExtensionsFileProvidersCompositePackageVersion) + $(MicrosoftExtensionsFileProvidersPhysicalPackageVersion) + $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) + $(MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion) + $(MicrosoftExtensionsHostingPackageVersion) + $(MicrosoftExtensionsHostingAbstractionsPackageVersion) + $(MicrosoftExtensionsHttpPackageVersion) + $(MicrosoftExtensionsLoggingPackageVersion) + $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) + $(MicrosoftExtensionsLoggingConfigurationPackageVersion) + $(MicrosoftExtensionsLoggingConsolePackageVersion) + $(MicrosoftExtensionsLoggingDebugPackageVersion) + $(MicrosoftExtensionsLoggingEventLogPackageVersion) + $(MicrosoftExtensionsLoggingEventSourcePackageVersion) + $(MicrosoftExtensionsLoggingTraceSourcePackageVersion) + $(MicrosoftExtensionsOptionsPackageVersion) + $(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion) + $(MicrosoftExtensionsOptionsDataAnnotationsPackageVersion) + $(MicrosoftExtensionsPrimitivesPackageVersion) + $(MicrosoftInternalRuntimeAspNetCoreTransportPackageVersion) + $(MicrosoftNETRuntimeMonoAOTCompilerTaskPackageVersion) + $(MicrosoftNETRuntimeWebAssemblySdkPackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCoreBrowserDebugHostTransportPackageVersion) + $(MicrosoftNETCorePlatformsPackageVersion) + $(MicrosoftWebXdtPackageVersion) + $(SystemCollectionsImmutablePackageVersion) + $(SystemCompositionPackageVersion) + $(SystemConfigurationConfigurationManagerPackageVersion) + $(SystemDiagnosticsDiagnosticSourcePackageVersion) + $(SystemDiagnosticsEventLogPackageVersion) + $(SystemDiagnosticsPerformanceCounterPackageVersion) + $(SystemDirectoryServicesProtocolsPackageVersion) + $(SystemFormatsAsn1PackageVersion) + $(SystemFormatsCborPackageVersion) + $(SystemIOHashingPackageVersion) + $(SystemIOPipelinesPackageVersion) + $(SystemMemoryDataPackageVersion) + $(SystemNetHttpJsonPackageVersion) + $(SystemNetHttpWinHttpHandlerPackageVersion) + $(SystemNetServerSentEventsPackageVersion) + $(SystemNumericsTensorsPackageVersion) + $(SystemReflectionMetadataPackageVersion) + $(SystemResourcesExtensionsPackageVersion) + $(SystemRuntimeCachingPackageVersion) + $(SystemSecurityCryptographyPkcsPackageVersion) + $(SystemSecurityCryptographyXmlPackageVersion) + $(SystemSecurityPermissionsPackageVersion) + $(SystemServiceProcessServiceControllerPackageVersion) + $(SystemTextEncodingsWebPackageVersion) + $(SystemTextJsonPackageVersion) + $(SystemThreadingAccessControlPackageVersion) + $(SystemThreadingChannelsPackageVersion) + $(SystemThreadingRateLimitingPackageVersion) + + $(MicrosoftCodeAnalysisCommonPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessAspNetCorePackageVersion) + + $(MicrosoftExtensionsCachingHybridPackageVersion) + $(MicrosoftExtensionsDiagnosticsTestingPackageVersion) + $(MicrosoftExtensionsTimeProviderTestingPackageVersion) + + $(optimizationlinuxarm64MIBCRuntimePackageVersion) + $(optimizationlinuxx64MIBCRuntimePackageVersion) + $(optimizationwindows_ntarm64MIBCRuntimePackageVersion) + $(optimizationwindows_ntx64MIBCRuntimePackageVersion) + $(optimizationwindows_ntx86MIBCRuntimePackageVersion) + + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildFrameworkPackageVersion) + $(MicrosoftBuildTasksCorePackageVersion) + $(MicrosoftBuildUtilitiesCorePackageVersion) + + $(NuGetFrameworksPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetVersioningPackageVersion) + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab3a9fd9cb29..b4b82aa78905 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -390,17 +390,17 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/extensions - 3f10dd4d52002f1d83435f7ca791b77fea1718e6 + c6529a0a68989cc881e4add4872c344917bc1ca9 - + https://github.com/dotnet/extensions - 3f10dd4d52002f1d83435f7ca791b77fea1718e6 + c6529a0a68989cc881e4add4872c344917bc1ca9 - + https://github.com/dotnet/extensions - 3f10dd4d52002f1d83435f7ca791b77fea1718e6 + c6529a0a68989cc881e4add4872c344917bc1ca9 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index bcbabaac12a1..d57f9aad228c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,6 +5,7 @@ --> + 10 0 @@ -56,126 +57,6 @@ false - - - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - - 9.8.0-preview.1.25374.2 - 9.8.0-preview.1.25374.2 - 9.8.0-preview.1.25374.2 - - 10.0.0-rc.1.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-rc.1.25377.103 - - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - - 3.2.0-preview.25377.103 - - 1.0.0-prerelease.25374.3 - 1.0.0-prerelease.25374.3 - 1.0.0-prerelease.25374.3 - 1.0.0-prerelease.25374.3 - 1.0.0-prerelease.25374.3 - - @@ -269,10 +150,6 @@ 9.0.0-rtm-24529-3 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version) - - 6.2.4 - 6.2.4 - 6.2.4 1.11.4 0.9.9 diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 31e1294d773e..90e04810f19f 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -107,68 +107,6 @@ try { "Packages in package-lock.json file resolved from wrong registry. All dependencies must be resolved from $registry" } - # - # Versions.props and Version.Details.xml - # - - Write-Host "Checking that Versions.props and Version.Details.xml match" - [xml] $versionProps = Get-Content "$repoRoot/eng/Versions.props" - [xml] $versionDetails = Get-Content "$repoRoot/eng/Version.Details.xml" - $globalJson = Get-Content $repoRoot/global.json | ConvertFrom-Json - - $versionVars = New-Object 'System.Collections.Generic.HashSet[string]' - foreach ($vars in $versionProps.SelectNodes("//PropertyGroup[`@Label=`"Automated`"]/*")) { - $versionVars.Add($vars.Name) | Out-Null - } - - foreach ($dep in $versionDetails.SelectNodes('//Dependency')) { - Write-Verbose "Found $dep" - - if ($dep.Label -eq 'Manual') { - # skip dependencies that are manually updated - continue - } - - $expectedVersion = $dep.Version - - if ($dep.Name -in $globalJson.'msbuild-sdks'.PSObject.Properties.Name) { - $actualVersion = $globalJson.'msbuild-sdks'.($dep.Name) - - if ($expectedVersion -ne $actualVersion) { - LogError -filepath "$repoRoot\global.json" ` - ("MSBuild SDK version '$($dep.Name)' in global.json does not match the value in " + - "Version.Details.xml. Expected '$expectedVersion', actual '$actualVersion'") - } - } - else { - $varName = $dep.Name -replace '\.','' - $varName = $varName -replace '\-','' - $varName = "${varName}Version" - - $versionVar = $versionProps.SelectSingleNode("//PropertyGroup[`@Label=`"Automated`"]/$varName") - $actualVersion = $versionVar.InnerText - $versionVars.Remove($varName) | Out-Null - - if (-not $versionVar) { - LogError "Missing version variable '$varName' in the 'Automated' property group in $repoRoot/eng/Versions.props" - continue - } - - if ($expectedVersion -ne $actualVersion) { - LogError -filepath "$repoRoot\eng\Versions.props" ` - ("Version variable '$varName' does not match the value in Version.Details.xml. " + - "Expected '$expectedVersion', actual '$actualVersion'") - } - } - } - - foreach ($unexpectedVar in $versionVars) { - LogError -Filepath "$repoRoot\eng\Versions.props" ` - ("Version variable '$unexpectedVar' does not have a matching entry in Version.Details.xml. " + - "See https://github.com/dotnet/aspnetcore/blob/main/docs/ReferenceResolution.md for instructions " + - "on how to add a new dependency.") - } - # ComponentsWebAssembly-CSharp.sln is used by the templating engine; MessagePack.sln is irrelevant (in submodule). $solution = Get-ChildItem "$repoRoot/AspNetCore.slnx" $solutionFile = Split-Path -Leaf $solution