diff --git a/NuGet.config b/NuGet.config index 85e13e71ea71..7e04985571cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,8 @@ - - - + + @@ -42,8 +41,7 @@ - - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e1ef1efed51d..1ed75535bbc4 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -1,4 +1,3 @@ - - 10.0.200-preview.25563.5 - 10.0.200-preview.25563.5 - 10.0.200-preview.25563.5 - 10.0.200-preview.25563.5 - 10.0.200-preview.25563.5 - 10.0.200-preview.25563.5 - 10.0.200-preview.25563.5 - 10.0.200-preview.25563.5 - 10.0.200-preview.25563.5 - - 10.0.0-preview.25568.105 - 18.1.0-preview-25568-105 - 18.1.0-preview-25568-105 - 7.1.0-preview.1.6905 - 5.3.0-1.25568.105 - 5.3.0-1.25568.105 - 5.3.0-1.25568.105 - 5.3.0-1.25568.105 - 5.3.0-1.25568.105 - 5.3.0-1.25568.105 - 5.3.0-1.25568.105 - 5.3.0-1.25568.105 - 10.0.0-preview.25568.105 - 5.3.0-1.25568.105 - 5.3.0-1.25568.105 - 10.0.0-beta.25568.105 - 10.0.0-beta.25568.105 - 10.0.0-beta.25568.105 - 10.0.0-beta.25568.105 - 10.0.0-beta.25568.105 - 10.0.0-beta.25568.105 - 10.0.0-beta.25568.105 - 10.0.0-beta.25568.105 - 15.0.200-servicing.25568.105 - 5.3.0-1.25568.105 - 5.3.0-1.25568.105 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.25568.105 - 18.1.0-preview-25568-105 - 10.0.200-preview.25568.105 - 10.0.200-preview.25568.105 - 10.0.200-preview.25568.105 - 10.0.200-preview.25568.105 - 10.0.200-preview.25568.105 - 10.0.200-preview.25568.105 - 10.0.200-preview.25568.105 - 10.0.200-preview.25568.105 - 10.0.200-preview.25568.105 - 18.1.0-preview-25568-105 - 18.1.0-preview-25568-105 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 - 7.1.0-preview.1.6905 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 - 10.0.0-rtm.25523.111 - 10.0.0-rtm.25523.111 - 10.0.0-rtm.25523.111 - 10.0.0-rtm.25523.111 - 10.0.0 - 10.0.0-rtm.25523.111 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0-rtm.25523.111 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0-rtm.25523.111 - 10.0.0 - 10.0.0-rtm.25523.111 - 10.0.0-rtm.25523.111 - 10.0.0 - 10.0.0 - 10.0.0-beta.25523.111 - 2.2.0-beta.25523.111 - 10.0.0 - 10.0.0 - 10.0.2-servicing.25601.110 - 10.0.2-servicing.25601.110 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0-rtm.25523.111 - 10.0.0 - 10.0.0 - 10.0.0-rtm.25523.111 - 10.0.0 - 10.0.0-rtm.25523.111 - 10.0.0-beta.25523.111 - 10.0.0-beta.25523.111 - 10.0.0-beta.25523.111 - 10.0.0-beta.25523.111 - 10.0.0-beta.25523.111 - 3.2.0-preview.25523.111 - 10.0.0 - 10.0.0-rtm.25523.111 - 10.0.0 - 10.0.0 - 2.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1 + 10.0.0-beta.25569.105 + 2.0.0-preview.1.25569.105 + 2.2.1-beta.25569.105 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.0-beta.25569.105 + 10.0.0-beta.25569.105 + 10.0.0-beta.25569.105 + 10.0.0-beta.25569.105 + 10.0.0-beta.25569.105 + 3.2.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1 + 2.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 2.1.0 10.0.0-preview.7.25377.103 - 18.1.0-preview-25523-02 - 18.1.0-preview-25523-02 + 18.3.0-preview-25610-02 + 18.3.0-preview-25610-02 + + 15.1.200-servicing.25605.1 - 5.3.0-2.25560.14 - 5.3.0-2.25560.14 - 5.3.0-2.25560.14 - 5.3.0-2.25560.14 - 5.3.0-2.25560.14 - 5.3.0-2.25560.14 - 5.3.0-2.25560.14 - 5.3.0-2.25560.14 - 5.3.0-2.25560.14 - 5.3.0-2.25560.14 - 5.3.0-2.25560.14 - 5.3.0-2.25560.14 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 7.1.0-preview.1.42 7.1.0-preview.1.42 @@ -190,24 +133,22 @@ This file should be imported by eng/Versions.props 7.1.0-preview.1.42 7.1.0-preview.1.42 - 18.1.0-preview-25506-01 - 18.1.0-preview-25506-01 - 18.1.0-preview-25506-01 + 18.3.0-preview-25609-01 + 18.3.0-preview-25609-01 + 18.3.0-preview-25609-01 10.0.0-preview.25552.2 10.0.0-preview.25552.2 10.0.0-preview.25552.2 - - 2.0.0-preview.1.25527.1 - 10.0.0-beta.25555.6 - 10.0.0-beta.25555.6 - 10.0.0-beta.25555.6 - 10.0.0-beta.25555.6 - 10.0.0-beta.25555.6 - 10.0.0-beta.25555.6 - 10.0.0-beta.25555.6 - 10.0.0-beta.25555.6 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 2.1.0-preview.25571.1 4.1.0-preview.25571.1 @@ -250,6 +191,7 @@ This file should be imported by eng/Versions.props $(MicrosoftAspNetCoreTestHostPackageVersion) $(MicrosoftBclAsyncInterfacesPackageVersion) $(MicrosoftBuildTasksGitPackageVersion) + $(MicrosoftDeploymentDotNetReleasesPackageVersion) $(MicrosoftDiaSymReaderPackageVersion) $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) @@ -348,8 +290,6 @@ This file should be imported by eng/Versions.props $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) - - $(MicrosoftDeploymentDotNetReleasesPackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) $(MicrosoftDotNetBuildTasksInstallersPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ff544fb9b79..7592ec421964 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,61 +2,61 @@ - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/msbuild + 2960e90f194e80f8f664ac573d456058bc4f5cd9 - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/msbuild + 2960e90f194e80f8f664ac573d456058bc4f5cd9 - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/fsharp + 89d788641914c5d0b87fddfa11f4df0b5cfaa73d - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/microsoft/vstest + bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/microsoft/vstest + bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/microsoft/vstest + bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/razor + 191feab170b690f6a4923072d1b6f6e00272d8a7 - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/razor + 191feab170b690f6a4923072d1b6f6e00272d8a7 - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/razor + 191feab170b690f6a4923072d1b6f6e00272d8a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/roslyn - 87392e460f076923c0e3cb82e01529feea61b6f2 + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/deployment-tools - 84ccc0553245e90355f32ea8ddcf169d9bd8f640 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/roslyn - 87392e460f076923c0e3cb82e01529feea61b6f2 + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 30f0638d1c0413878f282c0aeb4bead28497955a + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef https://github.com/microsoft/testfx @@ -565,9 +564,9 @@ https://github.com/microsoft/testfx 43e592148ac1c7916908477bdffcf2a345affa6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + fad253f51b461736dfd3cd9c15977bb7493becef diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index e7daa6d2fafe..3437087c80fc 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -120,6 +120,14 @@ jobs: - task: NuGetAuthenticate@1 + # Populate internal runtime variables. + - template: /eng/common/templates/steps/enable-internal-sources.yml + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + - task: AzureCLI@2 displayName: Publish Build Assets inputs: @@ -132,6 +140,9 @@ jobs: /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} /p:MaestroApiEndpoint=https://maestro.dot.net /p:OfficialBuildId=$(OfficialBuildId) + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' + condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -200,6 +211,8 @@ jobs: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/core-templates/steps/publish-logs.yml diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 30530359a5d6..76baf5c27258 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -3,7 +3,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' is1ESPipeline: '' @@ -25,10 +25,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - image: windows.vs2022.amd64.open + image: windows.vs2026preview.scout.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: @@ -41,4 +41,4 @@ jobs: - template: /eng/common/core-templates/steps/source-index-stage1-publish.yml parameters: - binLogPath: ${{ parameters.binLogPath }} \ No newline at end of file + binLogPath: ${{ parameters.binLogPath }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 55361908c2e9..9423d71ca3a2 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -127,11 +127,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -175,7 +175,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -236,7 +236,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -307,6 +307,13 @@ stages: - task: NuGetAuthenticate@1 + # Populate internal runtime variables. + - template: /eng/common/templates/steps/enable-internal-sources.yml + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + # Darc is targeting 8.0, so make sure it's installed - task: UseDotNet@2 inputs: @@ -328,3 +335,5 @@ stages: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index f2248ebfd730..553fce66b940 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -11,22 +11,41 @@ parameters: # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. microbuildUseESRP: true + # Microbuild installation directory + microBuildOutputFolder: $(Agent.TempDirectory)/MicroBuild continueOnError: false steps: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - # Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms + # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable - task: UseDotNet@2 displayName: Install .NET 8.0 SDK for MicroBuild Plugin inputs: packageType: sdk version: 8.0.x - # Installing the SDK in a '.dotnet-microbuild' directory is required for signing. - # See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj - # Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic. - installationPath: $(Agent.TempDirectory)/.dotnet-microbuild + installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + + - script: | + set -euo pipefail + + # UseDotNet@2 prepends the dotnet executable path to the PATH variable, so we can call dotnet directly + version=$(dotnet --version) + cat << 'EOF' > ${{ parameters.microBuildOutputFolder }}/global.json + { + "sdk": { + "version": "$version", + "paths": [ + "${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild" + ], + "errorMessage": "The .NET SDK version $version is required to install the MicroBuild signing plugin." + } + } + EOF + displayName: 'Add global.json to MicroBuild Installation path' + workingDirectory: ${{ parameters.microBuildOutputFolder }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - script: | @@ -64,7 +83,7 @@ steps: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) @@ -76,6 +95,7 @@ steps: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + workingDirectory: ${{ parameters.microBuildOutputFolder }} ${{ if eq(parameters.microbuildUseESRP, true) }}: ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: @@ -84,7 +104,7 @@ steps: ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc env: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 10f825e270a0..5a927b4c7bcb 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -26,8 +26,10 @@ steps: # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' - -BinlogToolVersion ${{parameters.BinlogToolVersion}} + -BinlogToolVersion '${{parameters.BinlogToolVersion}}' -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' + -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)' diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index acf16ed34963..b9c86c18ae42 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -24,7 +24,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey '$(dotnetbuilds-internal-container-read-token-base64)'' fi buildConfig=Release diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1eda208a3bbf..48e55598bdd2 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -7,7 +7,9 @@ param( [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $RequireDefaultChannels, - [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing + [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey ) try { diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1 index b7fc19591507..472d5bb562c9 100644 --- a/eng/common/post-build/redact-logs.ps1 +++ b/eng/common/post-build/redact-logs.ps1 @@ -7,8 +7,9 @@ param( # File with strings to redact - separated by newlines. # For comments start the line with '# ' - such lines are ignored [Parameter(Mandatory=$false)][string] $TokensFilePath, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact -) + [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey) try { $ErrorActionPreference = 'Stop' diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index b62e132d32a4..b64b66a6275b 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -9,6 +9,8 @@ Param( [switch][Alias('nobl')]$excludeCIBinaryLog, [switch]$noWarnAsError, [switch] $help, + [string] $runtimeSourceFeed = '', + [string] $runtimeSourceFeedKey = '', [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -68,7 +70,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 06b44de78709..578705ee4dbd 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -394,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0 - $defaultXCopyMSBuildVersion = '17.13.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0 + $defaultXCopyMSBuildVersion = '18.0.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/eng/common/vmr-sync.ps1 b/eng/common/vmr-sync.ps1 index 76e2f9d08fe8..97302f3205be 100755 --- a/eng/common/vmr-sync.ps1 +++ b/eng/common/vmr-sync.ps1 @@ -103,7 +103,7 @@ Set-StrictMode -Version Latest Highlight 'Installing .NET, preparing the tooling..' . .\eng\common\tools.ps1 $dotnetRoot = InitializeDotNetCli -install:$true -$darc = Get-Darc "1.1.0-beta.25514.2" +$darc = Get-Darc $dotnet = "$dotnetRoot\dotnet.exe" Highlight "Starting the synchronization of VMR.." diff --git a/eng/common/vmr-sync.sh b/eng/common/vmr-sync.sh index c038012a55aa..44239e331c0c 100755 --- a/eng/common/vmr-sync.sh +++ b/eng/common/vmr-sync.sh @@ -164,7 +164,7 @@ set -e highlight 'Installing .NET, preparing the tooling..' source "./eng/common/tools.sh" InitializeDotNetCli true -GetDarc "1.1.0-beta.25514.2" +GetDarc dotnetDir=$( cd ./.dotnet/; pwd -P ) dotnet=$dotnetDir/dotnet diff --git a/global.json b/global.json index 9bbbd2ccb1d4..0daa834cedbd 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25568.105", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25568.105", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25605.3", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25605.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" diff --git a/src/Layout/redist/targets/BundledTemplates.targets b/src/Layout/redist/targets/BundledTemplates.targets index 396bd59ea477..08b2b6eecb33 100644 --- a/src/Layout/redist/targets/BundledTemplates.targets +++ b/src/Layout/redist/targets/BundledTemplates.targets @@ -3,8 +3,9 @@ - - + + +