diff --git a/NuGet.config b/NuGet.config index f3f728c95515..b4cefe38af01 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 7655e93aa369..c78d31dbf6f7 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,140 +8,139 @@ This file should be imported by eng/Versions.props 2.1.0 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.0-preview.26120.103 - 10.0.2 - 10.0.2 - 18.3.0-release-26120-103 - 18.3.0-release-26120-103 - 7.3.0-preview.1.12103 - 10.0.200-alpha.26120.103 - 5.3.0-2.26120.103 - 5.3.0-2.26120.103 - 5.3.0-2.26120.103 - 5.3.0-2.26120.103 - 5.3.0-2.26120.103 - 5.3.0-2.26120.103 - 5.3.0-2.26120.103 - 5.3.0-2.26120.103 - 10.0.0-preview.26120.103 - 5.3.0-2.26120.103 - 5.3.0-2.26120.103 - 2.0.0-preview.1.25612.105 - 2.2.2 - 10.0.0-beta.26120.103 - 10.0.0-beta.26120.103 - 10.0.0-beta.26120.103 - 10.0.0-beta.26120.103 - 10.0.0-beta.26120.103 - 10.0.0-beta.26120.103 - 10.0.2 - 10.0.2 - 10.0.0-rtm.25523.111 - 10.0.0-rtm.25523.111 - 10.0.0-beta.26120.103 - 10.0.0-beta.26120.103 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 15.2.100-preview2.26120.103 - 10.0.2 - 5.3.0-2.26120.103 - 5.3.0-2.26120.103 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 + 10.0.4-servicing.26119.110 + 10.0.4-servicing.26119.110 + 10.0.4-servicing.26119.110 + 10.0.4-servicing.26119.110 + 10.0.4 + 10.0.4-servicing.26119.110 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4-servicing.26119.110 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4-servicing.26119.110 + 10.0.4 + 10.0.4-servicing.26119.110 + 10.0.4-servicing.26119.110 + 10.0.0-preview.26165.110 + 10.0.4 + 10.0.4 + 18.3.3 + 18.3.3-servicing-26165-110 + 7.3.0-rc.16610 + 10.0.202 + 5.3.0-2.26165.110 + 5.3.0-2.26165.110 + 5.3.0-2.26165.110 + 5.3.0-2.26165.110 + 5.3.0-2.26165.110 + 5.3.0-2.26165.110 + 5.3.0-2.26165.110 + 5.3.0-2.26165.110 + 10.0.0-preview.26165.110 + 5.3.0-2.26165.110 + 5.3.0-2.26165.110 + 2.0.0-preview.1.26119.110 + 2.2.4 + 10.0.0-beta.26165.110 + 10.0.0-beta.26165.110 + 10.0.0-beta.26165.110 + 10.0.0-beta.26165.110 + 10.0.0-beta.26165.110 + 10.0.0-beta.26165.110 + 10.0.4 + 10.0.4 + 10.0.4-servicing.26119.110 + 10.0.0-beta.26165.110 + 10.0.0-beta.26165.110 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 15.2.202-servicing.26165.110 + 10.0.4 + 5.3.0-2.26165.110 + 5.3.0-2.26165.110 + 10.0.4-servicing.26119.110 + 10.0.4 + 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26120.103 - 10.0.2-servicing.25612.105 - 18.3.0-release-26120-103 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.200-alpha.26120.103 - 10.0.200-alpha.26120.103 - 10.0.200-alpha.26120.103 - 10.0.200-alpha.26120.103 - 10.0.200-alpha.26120.103 - 10.0.200-preview.26120.103 - 10.0.200-preview.26120.103 - 10.0.200-preview.26120.103 - 10.0.200-preview.26120.103 - 10.0.200-preview.26120.103 - 10.0.200-preview.26120.103 - 10.0.200-preview.26120.103 - 10.0.200-preview.26120.103 - 10.0.200-preview.26120.103 - 18.3.0-release-26120-103 - 18.3.0-release-26120-103 - 3.2.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 7.3.0-preview.1.12103 - 10.0.2 - 2.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 + 10.0.0-preview.26165.110 + 10.0.4-servicing.26119.110 + 18.3.0-release-26165-110 + 10.0.4 + 10.0.4-servicing.26119.110 + 10.0.202 + 10.0.202 + 10.0.202 + 10.0.202 + 10.0.202 + 10.0.202 + 10.0.202 + 10.0.202 + 10.0.202-servicing.26165.110 + 10.0.202 + 10.0.202-servicing.26165.110 + 10.0.202 + 10.0.202 + 10.0.202-servicing.26165.110 + 18.3.0-release-26165-110 + 18.3.0-release-26165-110 + 3.2.4 + 10.0.4 + 10.0.4-servicing.26119.110 + 10.0.4 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 7.3.0-rc.16610 + 10.0.4 + 2.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 2.2.0-preview.26162.7 4.2.0-preview.26162.7 @@ -202,7 +201,6 @@ This file should be imported by eng/Versions.props $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotnetWpfProjectTemplatesPackageVersion) $(MicrosoftDotNetXliffTasksPackageVersion) $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cbb7f6967c4..d5c96cad8642 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa - - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://github.com/dotnet/dotnet - ee15891825b40d11a37b0d9f4357cfdc9ee7b884 + 371b9b5d0aefef66a1db9caba3a697ca58a04eb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 https://github.com/microsoft/testfx @@ -572,9 +568,9 @@ https://github.com/microsoft/testfx 3e9ace42a897c01e3bda83f4cadc9e8aad030b41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + 80d3e14f5e08b4888f464e3cd0d0b2445b63ec46 diff --git a/eng/Versions.props b/eng/Versions.props index 9a559567dec7..70247f7190b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 10 0 2 - 0 + 2 $([System.String]::Copy('$(VersionSDKMinorPatch)').PadLeft(2, '0')) - $([MSBuild]::Add($(VersionFeature), 25)) - $([MSBuild]::Add($(VersionFeature), 14)) + $([MSBuild]::Add($(VersionFeature), 24)) + $([MSBuild]::Add($(VersionFeature), 13)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 5a927b4c7bcb..a9ea99ba6aaa 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -31,7 +31,6 @@ steps: -runtimeSourceFeed https://ci.dot.net/internal -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' '$(publishing-dnceng-devdiv-code-r-build-re)' - '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' '$(akams-client-id)' '$(microsoft-symbol-server-pat)' diff --git a/eng/common/templates/steps/vmr-sync.yml b/eng/common/templates/steps/vmr-sync.yml index 599afb6186b8..eb619c502683 100644 --- a/eng/common/templates/steps/vmr-sync.yml +++ b/eng/common/templates/steps/vmr-sync.yml @@ -38,27 +38,6 @@ steps: displayName: Label PR commit workingDirectory: $(Agent.BuildDirectory)/repo -- script: | - vmr_sha=$(grep -oP '(?<=Sha=")[^"]*' $(Agent.BuildDirectory)/repo/eng/Version.Details.xml) - echo "##vso[task.setvariable variable=vmr_sha]$vmr_sha" - displayName: Obtain the vmr sha from Version.Details.xml (Unix) - condition: ne(variables['Agent.OS'], 'Windows_NT') - workingDirectory: $(Agent.BuildDirectory)/repo - -- powershell: | - [xml]$xml = Get-Content -Path $(Agent.BuildDirectory)/repo/eng/Version.Details.xml - $vmr_sha = $xml.SelectSingleNode("//Source").Sha - Write-Output "##vso[task.setvariable variable=vmr_sha]$vmr_sha" - displayName: Obtain the vmr sha from Version.Details.xml (Windows) - condition: eq(variables['Agent.OS'], 'Windows_NT') - workingDirectory: $(Agent.BuildDirectory)/repo - -- script: | - git fetch --all - git checkout $(vmr_sha) - displayName: Checkout VMR at correct sha for repo flow - workingDirectory: ${{ parameters.vmrPath }} - - script: | git config --global user.name "dotnet-maestro[bot]" git config --global user.email "dotnet-maestro[bot]@users.noreply.github.com" diff --git a/eng/common/templates/vmr-build-pr.yml b/eng/common/templates/vmr-build-pr.yml index ce3c29a62faf..2f3694fa1323 100644 --- a/eng/common/templates/vmr-build-pr.yml +++ b/eng/common/templates/vmr-build-pr.yml @@ -34,6 +34,7 @@ resources: type: github name: dotnet/dotnet endpoint: dotnet + ref: refs/heads/main # Set to whatever VMR branch the PR build should insert into stages: - template: /eng/pipelines/templates/stages/vmr-build.yml@vmr diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 049fe6db994e..977a2d4b1039 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -824,6 +824,11 @@ function MSBuild-Core() { $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" + # Add -mt flag for MSBuild multithreaded mode if enabled via environment variable + if ($env:MSBUILD_MT_ENABLED -eq "1") { + $cmdArgs += ' -mt' + } + if ($warnAsError) { $cmdArgs += ' /warnaserror /p:TreatWarningsAsErrors=true' } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index c1841c9dfd0f..1b296f646c23 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -526,7 +526,13 @@ function MSBuild-Core { } } - RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" + # Add -mt flag for MSBuild multithreaded mode if enabled via environment variable + local mt_switch="" + if [[ "${MSBUILD_MT_ENABLED:-}" == "1" ]]; then + mt_switch="-mt" + fi + + RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" } function GetDarc { diff --git a/eng/common/vmr-sync.ps1 b/eng/common/vmr-sync.ps1 index 97302f3205be..b37992d91cf0 100755 --- a/eng/common/vmr-sync.ps1 +++ b/eng/common/vmr-sync.ps1 @@ -103,12 +103,20 @@ Set-StrictMode -Version Latest Highlight 'Installing .NET, preparing the tooling..' . .\eng\common\tools.ps1 $dotnetRoot = InitializeDotNetCli -install:$true +$env:DOTNET_ROOT = $dotnetRoot $darc = Get-Darc -$dotnet = "$dotnetRoot\dotnet.exe" Highlight "Starting the synchronization of VMR.." # Synchronize the VMR +$versionDetailsPath = Resolve-Path (Join-Path $PSScriptRoot '..\Version.Details.xml') | Select-Object -ExpandProperty Path +[xml]$versionDetails = Get-Content -Path $versionDetailsPath +$repoName = $versionDetails.SelectSingleNode('//Source').Mapping +if (-not $repoName) { + Fail "Failed to resolve repo mapping from $versionDetailsPath" + exit 1 +} + $darcArgs = ( "vmr", "forwardflow", "--tmp", $tmpDir, @@ -130,9 +138,27 @@ if ($LASTEXITCODE -eq 0) { Highlight "Synchronization succeeded" } else { - Fail "Synchronization of repo to VMR failed!" - Fail "'$vmrDir' is left in its last state (re-run of this script will reset it)." - Fail "Please inspect the logs which contain path to the failing patch file (use -debugOutput to get all the details)." - Fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script." - exit 1 + Highlight "Failed to flow code into the local VMR. Falling back to resetting the VMR to match repo contents..." + git -C $vmrDir reset --hard + + $resetArgs = ( + "vmr", "reset", + "${repoName}:HEAD", + "--vmr", $vmrDir, + "--tmp", $tmpDir, + "--additional-remotes", "${repoName}:${repoRoot}" + ) + + & "$darc" $resetArgs + + if ($LASTEXITCODE -eq 0) { + Highlight "Successfully reset the VMR using 'darc vmr reset'" + } + else { + Fail "Synchronization of repo to VMR failed!" + Fail "'$vmrDir' is left in its last state (re-run of this script will reset it)." + Fail "Please inspect the logs which contain path to the failing patch file (use -debugOutput to get all the details)." + Fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script." + exit 1 + } } diff --git a/eng/common/vmr-sync.sh b/eng/common/vmr-sync.sh index 44239e331c0c..198caec59bd4 100755 --- a/eng/common/vmr-sync.sh +++ b/eng/common/vmr-sync.sh @@ -186,6 +186,13 @@ fi # Synchronize the VMR +version_details_path=$(cd "$scriptroot/.."; pwd -P)/Version.Details.xml +repo_name=$(grep -m 1 ' field ??= Path.GetDirectoryName(Path.GetDirectoryName(SdkPath)!)!; private static string ClientDirectory => field ??= Path.Combine(SdkPath, "Roslyn", "bincore"); private static string NuGetCachePath => field ??= SettingsUtility.GetGlobalPackagesFolder(Settings.LoadDefaultSettings(null)); - internal static string RuntimeVersion => field ??= RuntimeInformation.FrameworkDescription.Split(' ').Last(); - private static string DefaultRuntimeVersion => field ??= GetDefaultRuntimeVersion(); + internal static string RuntimeVersion => field ??= ComputeRuntimeVersion(); + private static string DefaultRuntimeVersion => field ??= ComputeDefaultRuntimeVersion(); private static string TargetFrameworkVersion => Product.TargetFrameworkVersion; public required string EntryPointFileFullPath { get; init; } @@ -432,10 +432,39 @@ public static bool IsPathOption(string arg, out int colonIndex) return false; } + private static string ComputeRuntimeVersion() + { + var result = GetConfiguredRuntimeVersion() ?? GetExecutingRuntimeVersion(); + Debug.Assert(!string.IsNullOrWhiteSpace(result)); + return result; + + static string? GetConfiguredRuntimeVersion() + { + string runtimeConfigPath = Path.Combine(SdkPath, "dotnet.runtimeconfig.json"); + if (!File.Exists(runtimeConfigPath)) return null; + + using var stream = File.OpenRead(runtimeConfigPath); + using var jsonDoc = JsonDocument.Parse(stream); + + JsonElement root = jsonDoc.RootElement; + if (!root.TryGetProperty("runtimeOptions", out JsonElement runtimeOptions) || + !runtimeOptions.TryGetProperty("framework", out JsonElement framework)) return null; + + string? runtimeVersion = framework.GetProperty("version").GetString(); + return runtimeVersion; + } + + static string? GetExecutingRuntimeVersion() + { + var executingRuntimeVersion = Path.GetFileName(Path.GetDirectoryName(System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory())); + return executingRuntimeVersion; + } + } + /// /// See GenerateDefaultRuntimeFrameworkVersion. /// - private static string GetDefaultRuntimeVersion() + private static string ComputeDefaultRuntimeVersion() { if (NuGetVersion.TryParse(RuntimeVersion, out var version)) { diff --git a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif index a2fa1a301694..3a511619a536 100644 --- a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif +++ b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif @@ -5,7 +5,7 @@ { "tool": { "name": "Microsoft.CodeAnalysis.CSharp.NetAnalyzers", - "version": "10.0.200", + "version": "10.0.202", "language": "en-US" }, "rules": { @@ -708,7 +708,7 @@ { "tool": { "name": "Microsoft.CodeAnalysis.NetAnalyzers", - "version": "10.0.200", + "version": "10.0.202", "language": "en-US" }, "rules": { @@ -6503,7 +6503,7 @@ { "tool": { "name": "Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers", - "version": "10.0.200", + "version": "10.0.202", "language": "en-US" }, "rules": {