diff --git a/Directory.Packages.props b/Directory.Packages.props index d29473d3f899..ae06797fdda4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -78,11 +78,11 @@ - - - - - + + + + + diff --git a/NuGet.config b/NuGet.config index f6cef5d25cf8..09870da28882 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,9 +6,6 @@ - - - @@ -40,9 +37,6 @@ - - - diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 7ebd390cf78f..1f39e2fe6240 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,140 +7,140 @@ This file should be imported by eng/Versions.props - 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-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-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.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-preview.7.25377.103 - 17.15.0-preview-25377-103 - 17.15.0-preview-25377-103 - 10.0.0-beta.25377.103 - 5.0.0-2.25377.103 - 5.0.0-2.25377.103 - 5.0.0-2.25377.103 - 5.0.0-2.25377.103 - 5.0.0-2.25377.103 - 5.0.0-2.25377.103 - 10.0.0-preview.25377.103 - 5.0.0-2.25377.103 - 10.0.0-preview.25377.103 - 5.0.0-2.25377.103 - 5.0.0-2.25377.103 - 2.0.0-preview.1.25377.103 - 2.2.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-beta.25377.103 - 10.0.0-beta.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-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-rc.1.25377.103 - 14.0.100-preview7.25377.103 - 10.0.0-rc.1.25377.103 - 5.0.0-2.25377.103 - 5.0.0-2.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-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-preview.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 17.15.0-preview-25410-101 + 17.15.0-preview-25410-101 + 7.0.0-preview.1.601 + 10.0.0-beta.25410.101 + 5.0.0-2.25410.101 + 5.0.0-2.25410.101 + 5.0.0-2.25410.101 + 5.0.0-2.25410.101 + 5.0.0-2.25410.101 + 5.0.0-2.25410.101 + 10.0.0-preview.25410.101 + 5.0.0-2.25410.101 + 10.0.0-preview.25410.101 + 5.0.0-2.25410.101 + 5.0.0-2.25410.101 + 2.0.0-preview.1.25410.101 + 2.2.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 14.0.100-preview7.25410.101 + 10.0.0-rc.1.25410.101 + 5.0.0-2.25410.101 + 5.0.0-2.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 10.0.0-preview.7.25377.103 - 10.0.0-preview.25377.103 - 10.0.0-preview.7.25377.103 - 18.0.0-preview-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.100-preview.7.25377.103 - 10.0.100-preview.7.25377.103 - 10.0.100-preview.7.25377.103 - 10.0.100-preview.7.25377.103 - 10.0.100-preview.7.25377.103 - 10.0.100-preview.7.25377.103 - 10.0.100-preview.7.25377.103 - 10.0.100-preview.7.25377.103 - 10.0.100-preview.7.25377.103 - 18.0.0-preview-25377-103 - 18.0.0-preview-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 - 2.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.25410.101 + 10.0.0-rc.1.25410.101 + 18.0.0-preview-25410-101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.0-beta.25410.101 + 10.0.100-rc.1.25410.101 + 10.0.100-rc.1.25410.101 + 10.0.100-rc.1.25410.101 + 10.0.100-rc.1.25410.101 + 10.0.100-rc.1.25410.101 + 10.0.100-rc.1.25410.101 + 10.0.100-rc.1.25410.101 + 10.0.100-rc.1.25410.101 + 10.0.100-rc.1.25410.101 + 18.0.0-preview-25410-101 + 18.0.0-preview-25410-101 + 3.2.0-preview.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 7.0.0-preview.1.601 + 10.0.0-rc.1.25410.101 + 2.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 + 10.0.0-rc.1.25410.101 2.1.0 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 7.0.0-preview.1.100 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 - 7.0.0-preview.1.100 1.9.0-preview.25407.1 3.11.0-preview.25407.1 @@ -175,6 +175,7 @@ This file should be imported by eng/Versions.props $(MicrosoftBclAsyncInterfacesPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildLocalizationPackageVersion) + $(MicrosoftBuildNuGetSdkResolverPackageVersion) $(MicrosoftBuildTasksGitPackageVersion) $(MicrosoftCodeAnalysisPackageVersion) $(MicrosoftCodeAnalysisBuildClientPackageVersion) @@ -241,6 +242,21 @@ This file should be imported by eng/Versions.props $(MicrosoftWin32SystemEventsPackageVersion) $(MicrosoftWindowsDesktopAppInternalPackageVersion) $(MicrosoftWindowsDesktopAppRefPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksConsolePackageVersion) + $(NuGetBuildTasksPackPackageVersion) + $(NuGetCommandLineXPlatPackageVersion) + $(NuGetCommandsPackageVersion) + $(NuGetCommonPackageVersion) + $(NuGetConfigurationPackageVersion) + $(NuGetCredentialsPackageVersion) + $(NuGetDependencyResolverCorePackageVersion) + $(NuGetFrameworksPackageVersion) + $(NuGetLibraryModelPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetProjectModelPackageVersion) + $(NuGetProtocolPackageVersion) + $(NuGetVersioningPackageVersion) $(SystemCodeDomPackageVersion) $(SystemCommandLinePackageVersion) $(SystemCompositionAttributedModelPackageVersion) @@ -265,23 +281,7 @@ This file should be imported by eng/Versions.props $(NETStandardLibraryRefPackageVersion) - $(MicrosoftBuildNuGetSdkResolverPackageVersion) - $(NuGetBuildTasksPackageVersion) - $(NuGetBuildTasksConsolePackageVersion) - $(NuGetBuildTasksPackPackageVersion) - $(NuGetCommandLineXPlatPackageVersion) - $(NuGetCommandsPackageVersion) - $(NuGetCommonPackageVersion) - $(NuGetConfigurationPackageVersion) - $(NuGetCredentialsPackageVersion) - $(NuGetDependencyResolverCorePackageVersion) - $(NuGetFrameworksPackageVersion) - $(NuGetLibraryModelPackageVersion) $(NuGetLocalizationPackageVersion) - $(NuGetPackagingPackageVersion) - $(NuGetProjectModelPackageVersion) - $(NuGetProtocolPackageVersion) - $(NuGetVersioningPackageVersion) $(MicrosoftTestingPlatformPackageVersion) $(MSTestPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 023330e5b8e2..95d8475a8e40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 @@ -68,166 +68,166 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - - https://github.com/nuget/nuget.client - d0d16d996284c217b41b0c194d5c51b087f21f8b + + https://github.com/dotnet/dotnet + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 https://github.com/nuget/nuget.client d0d16d996284c217b41b0c194d5c51b087f21f8b - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 https://github.com/microsoft/testfx @@ -561,9 +561,9 @@ https://github.com/microsoft/testfx e1f0a9d0bde8b48c4fbc69737642c1026f1ad062 - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + 8c7b3dcd2bd657c11b12973f1214e7c3c616b174 diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 8034815f4213..8bf7d23355bc 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -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) @@ -27,7 +27,7 @@ parameters: is1ESPipeline: '' jobs: - job: OneLocBuild${{ parameters.JobNameSuffix }} - + dependsOn: ${{ parameters.dependsOn }} displayName: OneLocBuild${{ parameters.JobNameSuffix }} @@ -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 }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 996a5f9c8725..d4cfd9ccd806 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -257,7 +257,20 @@ function Retry($downloadBlock, $maxRetries = 5) { function GetDotNetInstallScript([string] $dotnetRoot) { $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1' + $shouldDownload = $false + if (!(Test-Path $installScript)) { + $shouldDownload = $true + } else { + # Check if the script is older than 30 days + $fileAge = (Get-Date) - (Get-Item $installScript).LastWriteTime + if ($fileAge.Days -gt 30) { + Write-Host "Existing install script is too old, re-downloading..." + $shouldDownload = $true + } + } + + if ($shouldDownload) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 3def02a638d2..c1841c9dfd0f 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -300,8 +300,29 @@ function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + local timestamp_file="$root/.dotnet-install.timestamp" + local should_download=false if [[ ! -a "$install_script" ]]; then + should_download=true + elif [[ -f "$timestamp_file" ]]; then + # Check if the script is older than 30 days using timestamp file + local download_time=$(cat "$timestamp_file" 2>/dev/null || echo "0") + local current_time=$(date +%s) + local age_seconds=$((current_time - download_time)) + + # 30 days = 30 * 24 * 60 * 60 = 2592000 seconds + if [[ $age_seconds -gt 2592000 ]]; then + echo "Existing install script is too old, re-downloading..." + should_download=true + fi + else + # No timestamp file exists, assume script is old and re-download + echo "No timestamp found for existing install script, re-downloading..." + should_download=true + fi + + if [[ "$should_download" == true ]]; then mkdir -p "$root" echo "Downloading '$install_script_url'" @@ -328,6 +349,9 @@ function GetDotNetInstallScript { ExitWithExitCode $exit_code } fi + + # Create timestamp file to track download time in seconds from epoch + date +%s > "$timestamp_file" fi # return value _GetDotNetInstallScript="$install_script" diff --git a/global.json b/global.json index ed1de1c9796d..a7b61079c498 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.100-preview.7.25367.101", + "dotnet": "10.0.100-preview.7.25372.107", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25377.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25377.103", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25410.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25410.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" diff --git a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs index 306504464cc2..375d8ab34503 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs @@ -37,11 +37,6 @@ internal sealed class CompilationHandler : IDisposable private bool _isDisposed; - static CompilationHandler() - { - WatchHotReloadService.RequireCommit = true; - } - public CompilationHandler(IReporter reporter, ProcessRunner processRunner) { _reporter = reporter; diff --git a/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.cs b/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.cs index faf6829896d6..e5f1d68da330 100644 --- a/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.cs +++ b/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.cs @@ -210,6 +210,8 @@ private void PrepareAuxiliaryFiles(out string rspPath) build_property.EnableSingleFileAnalyzer = true build_property.EnableTrimAnalyzer = true build_property.IncludeAllContentForSelfExtract = + build_property.VerifyReferenceTrimCompatibility = + build_property.VerifyReferenceAotCompatibility = build_property.TargetFramework = net{TargetFrameworkVersion} build_property.TargetFrameworkIdentifier = .NETCoreApp build_property.TargetFrameworkVersion = v{TargetFrameworkVersion} diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj index b324bfd1f745..bd4f7fa0e7c9 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj @@ -40,7 +40,7 @@ $(DefineConstants);MinimumVSVersion=$(MinimumVSVersion) - $(DefineConstants);PlatformToken=$(InstallerPlatform.ToUpper()) + $(DefineConstants);PlatformToken=$(TargetArchitecture.ToUpper()) $(DefineConstants);FinalizerExeSourceFile=$(FinalizerExeSourceFile) diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj index 25355e22c782..67c1469a6f82 100644 --- a/src/Layout/redist/redist.csproj +++ b/src/Layout/redist/redist.csproj @@ -73,8 +73,9 @@ - - + + + - + - + - { - { "AssemblyInformationalVersionAttribute", "1.2.3-beta" }, - { "AssemblyFileVersionAttribute", "4.5.6.7" }, - { "AssemblyVersionAttribute", "8.9.10.11" }, - { "AssemblyCompanyAttribute", "TestCompany" }, - { "AssemblyConfigurationAttribute", "Release" }, - { "AssemblyCopyrightAttribute", "TestCopyright" }, - { "AssemblyDescriptionAttribute", "TestDescription" }, - { "AssemblyProductAttribute", "TestProduct" }, - { "AssemblyTitleAttribute", "TestTitle" }, - { "AssemblyTrademarkAttribute", "TestTrademark" }, - { "NeutralResourcesLanguageAttribute", "fr" }, + var expectedInfo = new HashSet<(string Key, string Value)> + { + ("AssemblyInformationalVersionAttribute", "1.2.3-beta"), + ("AssemblyFileVersionAttribute", "4.5.6.7"), + ("AssemblyVersionAttribute", "8.9.10.11"), + ("AssemblyCompanyAttribute", "TestCompany"), + ("AssemblyConfigurationAttribute", "Release"), + ("AssemblyCopyrightAttribute", "TestCopyright"), + ("AssemblyDescriptionAttribute", "TestDescription"), + ("AssemblyProductAttribute", "TestProduct"), + ("AssemblyTitleAttribute", "TestTitle"), + ("AssemblyTrademarkAttribute", "TestTrademark"), + ("NeutralResourcesLanguageAttribute", "fr"), }; if (attributeToOptOut == "All") @@ -71,15 +71,15 @@ public void It_respects_opt_outs(string attributeToOptOut) } else { - expectedInfo.Remove(attributeToOptOut); + expectedInfo.RemoveWhere(i => i.Key == attributeToOptOut); } - expectedInfo.Add("TargetFrameworkAttribute", $".NETCoreApp,Version=v{ToolsetInfo.CurrentTargetFrameworkVersion}"); + expectedInfo.Add(("TargetFrameworkAttribute", $".NETCoreApp,Version=v{ToolsetInfo.CurrentTargetFrameworkVersion}")); var assemblyPath = Path.Combine(buildCommand.GetOutputDirectory(ToolsetInfo.CurrentTargetFramework, "Release").FullName, "HelloWorld.dll"); var actualInfo = AssemblyInfo.Get(assemblyPath); - actualInfo.Should().Equal(expectedInfo); + actualInfo.Should().BeEquivalentTo(expectedInfo); } [Fact] @@ -235,7 +235,7 @@ public void It_includes_source_revision_id_if_available__version_with_plus() command.GetValues().Should().BeEquivalentTo(new[] { "1.2.3+abc.xyz" }); } - [WindowsOnlyTheory] + [Theory] [InlineData(ToolsetInfo.CurrentTargetFramework)] [InlineData("net45")] public void It_respects_version_prefix(string targetFramework) @@ -258,9 +258,9 @@ public void It_respects_version_prefix(string targetFramework) var assemblyPath = Path.Combine(buildCommand.GetOutputDirectory(targetFramework).FullName, "HelloWorld.dll"); var info = AssemblyInfo.Get(assemblyPath); - info["AssemblyVersionAttribute"].Should().Be("1.2.3.0"); - info["AssemblyFileVersionAttribute"].Should().Be("1.2.3.0"); - info["AssemblyInformationalVersionAttribute"].Should().Be("1.2.3"); + info.Should().Contain(("AssemblyVersionAttribute", "1.2.3.0")); + info.Should().Contain(("AssemblyFileVersionAttribute", "1.2.3.0")); + info.Should().Contain(("AssemblyInformationalVersionAttribute", "1.2.3")); } [WindowsOnlyTheory] @@ -285,7 +285,7 @@ public void It_respects_version_changes_on_incremental_build(string targetFramew // Then the version of the built assembly shall match the provided VersionPrefix var assemblyPath = Path.Combine(incrementalBuildCommand.GetOutputDirectory(targetFramework).FullName, "HelloWorld.dll"); var info = AssemblyInfo.Get(assemblyPath); - info["AssemblyVersionAttribute"].Should().Be("1.2.4.0"); + info.Should().Contain(("AssemblyVersionAttribute", "1.2.4.0")); BuildCommand BuildProject(string versionPrefix) { @@ -307,7 +307,7 @@ public void It_respects_custom_assembly_attribute_items_on_incremental_build() var firstBuildCommand = BuildProject(buildNumber: "1"); var assemblyPath = Path.Combine(firstBuildCommand.GetOutputDirectory(targetFramework).FullName, "TestLibrary.dll"); - AssemblyInfo.Get(assemblyPath)["AssemblyMetadataAttribute"].Should().Be("BuildNumber:1"); + AssemblyInfo.Get(assemblyPath).Should().Contain(("AssemblyMetadataAttribute", "BuildNumber:1")); var firstWriteTime = File.GetLastWriteTimeUtc(assemblyPath); @@ -324,7 +324,7 @@ public void It_respects_custom_assembly_attribute_items_on_incremental_build() File.GetLastWriteTimeUtc(assemblyPath).Should().NotBe(firstWriteTime); // and the custom assembly should be generated with the updated value. - AssemblyInfo.Get(assemblyPath)["AssemblyMetadataAttribute"].Should().Be("BuildNumber:2"); + AssemblyInfo.Get(assemblyPath).Should().Contain(("AssemblyMetadataAttribute", "BuildNumber:2")); BuildCommand BuildProject(string buildNumber) { @@ -358,7 +358,7 @@ public void It_includes_internals_visible_to() var assemblyPath = Path.Combine(buildCommand.GetOutputDirectory("netstandard2.0").FullName, "HelloWorld.dll"); - AssemblyInfo.Get(assemblyPath)["InternalsVisibleToAttribute"].Should().Be("Tests"); + AssemblyInfo.Get(assemblyPath).Should().Contain(("InternalsVisibleToAttribute", "Tests")); } [RequiresMSBuildVersionTheory("17.0.0.32901")] @@ -552,7 +552,7 @@ public void It_respects_out_out_of_internals_visible_to() var assemblyPath = Path.Combine(buildCommand.GetOutputDirectory("netstandard2.0").FullName, "HelloWorld.dll"); - Assert.False(AssemblyInfo.Get(assemblyPath).ContainsKey("InternalsVisibleToAttribute")); + AssemblyInfo.Get(assemblyPath).Should().NotContain(i => i.Key == "InternalsVisibleToAttribute"); } [Fact] @@ -578,7 +578,7 @@ public void It_includes_internals_visible_to_with_key() var assemblyPath = Path.Combine(buildCommand.GetOutputDirectory("netstandard2.0").FullName, "HelloWorld.dll"); - AssemblyInfo.Get(assemblyPath)["InternalsVisibleToAttribute"].Should().Be("Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001001d3e6bbb36e11ea61ceff6e1022b23dd779fc6230838db2d25a2c7c8433b3fcf86b16c25b281fc3db1027c0675395e7d0548e6add88b6a811962bf958101fa9e243b1618313bee11f5e3b3fefda7b1d1226311b6cc2d07e87ff893ba6890b20082df34a0aac14b605b8be055e81081a626f8c69e9ed4bbaa4eae9f94a35accd2"); + AssemblyInfo.Get(assemblyPath).Should().Contain(("InternalsVisibleToAttribute", "Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001001d3e6bbb36e11ea61ceff6e1022b23dd779fc6230838db2d25a2c7c8433b3fcf86b16c25b281fc3db1027c0675395e7d0548e6add88b6a811962bf958101fa9e243b1618313bee11f5e3b3fefda7b1d1226311b6cc2d07e87ff893ba6890b20082df34a0aac14b605b8be055e81081a626f8c69e9ed4bbaa4eae9f94a35accd2")); } [Fact] @@ -605,7 +605,7 @@ public void It_includes_internals_visible_to_with_project_publickey() var assemblyPath = Path.Combine(buildCommand.GetOutputDirectory("netstandard2.0").FullName, "HelloWorld.dll"); - AssemblyInfo.Get(assemblyPath)["InternalsVisibleToAttribute"].Should().Be("Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001001d3e6bbb36e11ea61ceff6e1022b23dd779fc6230838db2d25a2c7c8433b3fcf86b16c25b281fc3db1027c0675395e7d0548e6add88b6a811962bf958101fa9e243b1618313bee11f5e3b3fefda7b1d1226311b6cc2d07e87ff893ba6890b20082df34a0aac14b605b8be055e81081a626f8c69e9ed4bbaa4eae9f94a35accd2"); + AssemblyInfo.Get(assemblyPath).Should().Contain(("InternalsVisibleToAttribute", "Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001001d3e6bbb36e11ea61ceff6e1022b23dd779fc6230838db2d25a2c7c8433b3fcf86b16c25b281fc3db1027c0675395e7d0548e6add88b6a811962bf958101fa9e243b1618313bee11f5e3b3fefda7b1d1226311b6cc2d07e87ff893ba6890b20082df34a0aac14b605b8be055e81081a626f8c69e9ed4bbaa4eae9f94a35accd2")); } [Fact] @@ -631,11 +631,11 @@ public void It_includes_assembly_metadata() var assemblyPath = Path.Combine(buildCommand.GetOutputDirectory("netstandard2.0").FullName, "HelloWorld.dll"); - AssemblyInfo.Get(assemblyPath)["AssemblyMetadataAttribute"].Should().Be("MetadataKey:MetadataValue"); + AssemblyInfo.Get(assemblyPath).Should().Contain(("AssemblyMetadataAttribute", "MetadataKey:MetadataValue")); } [Fact] - public void It_respects_out_out_of_assembly_metadata() + public void It_respects_opt_out_of_assembly_metadata() { var testAsset = _testAssetsManager .CopyTestAsset("HelloWorld") @@ -659,7 +659,7 @@ public void It_respects_out_out_of_assembly_metadata() var assemblyPath = Path.Combine(buildCommand.GetOutputDirectory("netstandard2.0").FullName, "HelloWorld.dll"); - Assert.False(AssemblyInfo.Get(assemblyPath).ContainsKey("AssemblyMetadataAttribute")); + AssemblyInfo.Get(assemblyPath).Should().NotContain(i => i.Key == "AssemblyMetadataAttribute"); } [Theory] @@ -699,11 +699,11 @@ public void GenerateUserSecrets(bool referenceAspNetCore, bool referenceExtensio if (shouldHaveAttribute) { - AssemblyInfo.Get(assemblyPath)["UserSecretsIdAttribute"].Should().Be("SecretsIdValue"); + AssemblyInfo.Get(assemblyPath).Should().Contain(("UserSecretsIdAttribute", "SecretsIdValue")); } else { - AssemblyInfo.Get(assemblyPath).Should().NotContainKey("SecretsIdValue"); + AssemblyInfo.Get(assemblyPath).Should().NotContain(i => i.Key == "SecretsIdValue"); } } @@ -743,7 +743,7 @@ public void GenerateUserSecretsForTestProject() var assemblyPath = Path.Combine(buildCommand.GetOutputDirectory(testTestProject.TargetFrameworks).FullName, testTestProject.Name + ".dll"); - AssemblyInfo.Get(assemblyPath)["UserSecretsIdAttribute"].Should().Be("SecretsIdValue"); + AssemblyInfo.Get(assemblyPath).Should().Contain(("UserSecretsIdAttribute", "SecretsIdValue")); } [Theory] @@ -775,7 +775,7 @@ public void It_includes_repository_url(bool privateRepo) var assemblyPath = Path.Combine(buildCommand.GetOutputDirectory(testProject.TargetFrameworks).FullName, testProject.Name + ".dll"); - AssemblyInfo.Get(assemblyPath)["AssemblyMetadataAttribute"].Should().Be("RepositoryUrl:" + fakeUrl); + AssemblyInfo.Get(assemblyPath).Should().Contain(("AssemblyMetadataAttribute", "RepositoryUrl:" + fakeUrl)); } [Theory] @@ -804,11 +804,11 @@ public void It_does_not_write_to_undefined_assembly_metadata_attribute(string ta if (containsAttribute) { - AssemblyInfo.Get(assemblyPath)["AssemblyMetadataAttribute"].Should().Be("RepositoryUrl:" + fakeUrl); + AssemblyInfo.Get(assemblyPath).Should().Contain(("AssemblyMetadataAttribute", "RepositoryUrl:" + fakeUrl)); } else { - AssemblyInfo.Get(assemblyPath).ContainsKey("AssemblyMetadataAttribute").Should().Be(false); + AssemblyInfo.Get(assemblyPath).Should().NotContain(i => i.Key == "AssemblyMetadataAttribute"); } } diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToVerifyNuGetReferenceCompat.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToVerifyNuGetReferenceCompat.cs index 94133426e5f4..a51dc8cffa2e 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToVerifyNuGetReferenceCompat.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToVerifyNuGetReferenceCompat.cs @@ -41,16 +41,16 @@ public void Nuget_reference_compat(string referencerTarget, string testDescripti // Process all dependencies in parallel Parallel.ForEach( - rawDependencyTargets.Split(',', ';', ' ').Where(s => !string.IsNullOrWhiteSpace(s)), + rawDependencyTargets.Split(',', ';', ' ').Where(s => !string.IsNullOrWhiteSpace(s)), new ParallelOptions { MaxDegreeOfParallelism = Environment.ProcessorCount }, - dependencyTarget => + dependencyTarget => { // Create the dependency project and package TestProject dependencyProject = GetTestProject( - ConstantStringValues.DependencyDirectoryNamePrefix + dependencyTarget.Replace('.', '_'), - dependencyTarget, + ConstantStringValues.DependencyDirectoryNamePrefix + dependencyTarget.Replace('.', '_'), + dependencyTarget, true); - + TestPackageReference dependencyPackageReference = new( dependencyProject.Name, "1.0.0", @@ -208,7 +208,7 @@ public void It_chooses_lowest_netfx_in_default_atf() buildCommand.Execute().Should().Pass(); var referencedDll = buildCommand.GetOutputDirectory().File("net462_net472_pkg.dll").FullName; - var referencedTargetFramework = AssemblyInfo.Get(referencedDll)["TargetFrameworkAttribute"]; + var referencedTargetFramework = AssemblyInfo.Get(referencedDll).Where(i => i.Key == "TargetFrameworkAttribute").Single().Value; referencedTargetFramework.Should().Be(".NETFramework,Version=v4.6.2"); } diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index a87d3e8f3ee8..a4cfbcb6d1f6 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -593,7 +593,7 @@ public void IsAotCompatible_implies_enable_analyzers(string targetFramework) var assemblyPath = Path.Combine(outputDirectory, $"{projectName}.dll"); // injects the IsTrimmable attribute - AssemblyInfo.Get(assemblyPath)["AssemblyMetadataAttribute"].Should().Be("IsTrimmable:True"); + AssemblyInfo.Get(assemblyPath).Should().Contain(("AssemblyMetadataAttribute", "IsTrimmable:True")); var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); publishCommand diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index 8e5a4e24a227..9722cd14b919 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -108,7 +108,7 @@ public void ILLink_runs_and_creates_linked_app(string targetFramework, bool refe } // https://github.com/dotnet/sdk/issues/49665 - // ILLINK : Failed to load /private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/10.0.0-preview.6.25315.102/libhostpolicy.dylib, error : dlopen(/private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/10.0.0-preview.6.25315.102/libhostpolicy.dylib, 0x0001): tried: '/private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/10.0.0-preview.6.25315.102/libhostpolicy.dylib' (mach-o file, but is an incompatible architecture (have 'x86_64', need 'arm64')), + // ILLINK : Failed to load /private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/10.0.0-preview.6.25315.102/libhostpolicy.dylib, error : dlopen(/private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/10.0.0-preview.6.25315.102/libhostpolicy.dylib, 0x0001): tried: '/private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/10.0.0-preview.6.25315.102/libhostpolicy.dylib' (mach-o file, but is an incompatible architecture (have 'x86_64', need 'arm64')), [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)] [MemberData(nameof(SupportedTfms), MemberType = typeof(PublishTestUtils))] public void ILLink_links_simple_app_without_analysis_warnings_and_it_runs(string targetFramework) @@ -599,7 +599,7 @@ public void ILLink_analysis_warnings_are_disabled_by_default(string targetFramew } // https://github.com/dotnet/sdk/issues/49665 - // ILLINK : Failed to load /private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/7.0.0/libhostpolicy.dylib, error : dlopen(/private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/7.0.0/libhostpolicy.dylib, 0x0001): tried: '/private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/7.0.0/libhostpolicy.dylib' (mach-o file, but is an incompatible architecture (have 'x86_64', need 'arm64')), + // ILLINK : Failed to load /private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/7.0.0/libhostpolicy.dylib, error : dlopen(/private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/7.0.0/libhostpolicy.dylib, 0x0001): tried: '/private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/7.0.0/libhostpolicy.dylib' (mach-o file, but is an incompatible architecture (have 'x86_64', need 'arm64')), [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)] [MemberData(nameof(Net6Plus), MemberType = typeof(PublishTestUtils))] public void ILLink_analysis_warnings_are_enabled_by_default(string targetFramework) @@ -1780,7 +1780,7 @@ public void Build_respects_IsTrimmable_property(string targetFramework, bool isE var runtimeConfigPath = Path.Combine(outputDirectory, $"{projectName}.runtimeconfig.json"); // injects the IsTrimmable attribute - AssemblyInfo.Get(assemblyPath)["AssemblyMetadataAttribute"].Should().Be("IsTrimmable:True"); + AssemblyInfo.Get(assemblyPath).Should().Contain(("AssemblyMetadataAttribute", "IsTrimmable:True")); // just setting IsTrimmable doesn't enable feature settings // (these only affect apps, and wouldn't make sense for libraries either) @@ -1823,7 +1823,7 @@ public void Build_respects_PublishTrimmed_property(string targetFramework) configProperties["System.Text.Json.JsonSerializer.IsReflectionEnabledByDefault"].Value().Should().BeFalse(); // just setting PublishTrimmed doesn't inject the IsTrimmable attribute - AssemblyInfo.Get(assemblyPath).ContainsKey("AssemblyMetadataAttribute").Should().BeFalse(); + AssemblyInfo.Get(assemblyPath).Should().NotContain(i => i.Key == "AssemblyMetadataAttribute"); } } diff --git a/test/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupOutputsTests.cs b/test/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupOutputsTests.cs index 942862063ad3..edb59cb8a5cf 100644 --- a/test/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupOutputsTests.cs +++ b/test/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupOutputsTests.cs @@ -20,7 +20,7 @@ public PublishItemsOutputGroupOutputsTests(ITestOutputHelper log) : base(log) [Theory] [InlineData(true, false)] - [InlineData(true, true)] + [InlineData(true, true, Skip = "https://github.com/dotnet/sdk/issues/49926")] [InlineData(false, false)] public void RunPublishItemsOutputGroupOutputsTest(bool specifyRid, bool singleFile) { diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs index 8b494c58c2e6..59e6d691fbbb 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs @@ -44,7 +44,7 @@ public void Build60Hosted_Works() new FileInfo(Path.Combine(serverBuildOutputDirectory, $"{testAsset}.Shared.dll")).Should().Exist(); } - [WindowsOnlyRequiresMSBuildVersionFact("17.13", Reason = "Needs System.Text.Json 8.0.5")] // https://github.com/dotnet/sdk/issues/44886 + [WindowsOnlyRequiresMSBuildVersionFact("17.13", Reason = "Needs System.Text.Json 8.0.5", Skip = "https://github.com/dotnet/sdk/issues/49925")] // https://github.com/dotnet/sdk/issues/44886 [SkipOnPlatform(TestPlatforms.Linux | TestPlatforms.OSX, "https://github.com/dotnet/sdk/issues/42145")] public void Publish60Hosted_Works() { diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/BuildIntegrationTest.cs b/test/Microsoft.NET.Sdk.Razor.Tests/BuildIntegrationTest.cs index 25ef587451c8..75ff26f13bd7 100644 --- a/test/Microsoft.NET.Sdk.Razor.Tests/BuildIntegrationTest.cs +++ b/test/Microsoft.NET.Sdk.Razor.Tests/BuildIntegrationTest.cs @@ -162,8 +162,8 @@ public void Build_AddsApplicationPartAttributes() var assemblyPath = Path.Combine(intermediateOutputPath, "SimpleMvc.dll"); - AssemblyInfo.Get(assemblyPath)["AssemblyTitleAttribute"].Should().Be("SimpleMvc"); - AssemblyInfo.Get(assemblyPath)["ProvideApplicationPartFactoryAttribute"].Should().Contain("ConsolidatedAssemblyApplicationPartFactory"); + AssemblyInfo.Get(assemblyPath).Should().Contain(("AssemblyTitleAttribute", "SimpleMvc")); + AssemblyInfo.Get(assemblyPath).Should().Contain(("ProvideApplicationPartFactoryAttribute", "Microsoft.AspNetCore.Mvc.ApplicationParts.ConsolidatedAssemblyApplicationPartFactory, Microsoft.AspNetCore.Mvc.Razor")); } diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs b/test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs index a7c5eb5cee8e..211853bbd4e0 100644 --- a/test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs +++ b/test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs @@ -12,7 +12,7 @@ public BuildWithComponentsIntegrationTest(ITestOutputHelper log) : base(log) { } [CoreMSBuildOnlyFact] public void Build_Components_WithDotNetCoreMSBuild_Works() => Build_ComponentsWorks(); - [RequiresMSBuildVersionFact("17.10.0.8101")] + [RequiresMSBuildVersionFact("17.10.0.8101", Skip = "https://github.com/dotnet/sdk/issues/49925")] public void Build_Components_WithDesktopMSBuild_Works() => Build_ComponentsWorks(); [Fact] diff --git a/test/Microsoft.NET.TestFramework/AssemblyInfo.cs b/test/Microsoft.NET.TestFramework/AssemblyInfo.cs index 30cb5bce3003..63ddb4c9e32f 100644 --- a/test/Microsoft.NET.TestFramework/AssemblyInfo.cs +++ b/test/Microsoft.NET.TestFramework/AssemblyInfo.cs @@ -46,9 +46,9 @@ public static List GetParameterlessAttributes(string assemblyPath) return parameterlessAttributes; } - public static IDictionary Get(string assemblyPath) + public static ISet<(string Key, string Value)> Get(string assemblyPath) { - var dictionary = new SortedDictionary(); + var assemblyInfo = new HashSet<(string, string)>(); using (var stream = File.OpenRead(assemblyPath)) using (var peReader = new PEReader(stream)) @@ -59,7 +59,7 @@ public static IDictionary Get(string assemblyPath) // AssemblyVersion is not actually a custom attribute if (assemblyDefinition.Version != new Version(0, 0, 0, 0)) { - dictionary.Add("AssemblyVersionAttribute", assemblyDefinition.Version.ToString()); + assemblyInfo.Add(("AssemblyVersionAttribute", assemblyDefinition.Version.ToString())); } foreach (var handle in assemblyDefinition.GetCustomAttributes()) @@ -108,12 +108,12 @@ public static IDictionary Get(string assemblyPath) if (sb != null) { - dictionary.Add(name, sb.ToString()); + assemblyInfo.Add((name, sb.ToString())); } } } - return dictionary; + return assemblyInfo; } } }