diff --git a/eng/Publishing.props b/eng/Publishing.props index 802134fadee4..2369b1487145 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -43,10 +43,19 @@ - + + + + + + + + - - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 + + 10.0.0-preview.26072.101 + 18.3.0-release-26072-101 + 18.3.0-release-26072-101 + 7.3.0-preview.1.7301 + 10.0.200-alpha.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 10.0.0-preview.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 15.2.100-alpha.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.26072.101 + 18.3.0-release-26072-101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 18.3.0-release-26072-101 + 18.3.0-release-26072-101 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 10.0.2-servicing.25612.105 10.0.2-servicing.25612.105 @@ -40,11 +93,12 @@ This file should be imported by eng/Versions.props 10.0.2-servicing.25612.105 10.0.2 10.0.2 - 10.0.102 2.0.0-preview.1.25612.105 2.2.2 10.0.2 10.0.2 + 10.0.0-rtm.25523.111 + 10.0.0-rtm.25523.111 10.0.2 10.0.2 10.0.2 @@ -61,11 +115,6 @@ This file should be imported by eng/Versions.props 10.0.2-servicing.25612.105 10.0.2 10.0.2-servicing.25612.105 - 10.0.102 - 10.0.102 - 10.0.102 - 10.0.102 - 10.0.102 3.2.2 10.0.2 10.0.2-servicing.25612.105 @@ -94,68 +143,48 @@ This file should be imported by eng/Versions.props 10.0.2 2.1.0 - - 10.0.0-preview.7.25377.103 - - 18.3.0-preview-26062-04 - 18.3.0-preview-26062-04 - - 15.1.200-servicing.26063.5 - - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - - 18.3.0-release-26055-04 - 18.3.0-release-26055-04 - 18.3.0-release-26055-04 - - 10.0.0-preview.26065.1 - 10.0.0-preview.26065.1 - 10.0.0-preview.26065.1 - - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 2.1.0-preview.26071.3 4.1.0-preview.26071.3 - + + $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildLocalizationPackageVersion) + $(MicrosoftBuildNuGetSdkResolverPackageVersion) + $(MicrosoftBuildTasksGitPackageVersion) + $(MicrosoftCodeAnalysisPackageVersion) + $(MicrosoftCodeAnalysisBuildClientPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) + $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) + $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) + $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) + $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetSignToolPackageVersion) + $(MicrosoftDotNetXliffTasksPackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) + $(MicrosoftFSharpCompilerPackageVersion) + $(MicrosoftNetCompilersToolsetPackageVersion) + $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) + $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) + $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) + $(MicrosoftNETTestSdkPackageVersion) + $(MicrosoftSourceLinkAzureReposGitPackageVersion) + $(MicrosoftSourceLinkBitbucketGitPackageVersion) + $(MicrosoftSourceLinkCommonPackageVersion) + $(MicrosoftSourceLinkGitHubPackageVersion) + $(MicrosoftSourceLinkGitLabPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion) $(MicrosoftTemplateEngineEdgePackageVersion) @@ -165,6 +194,24 @@ This file should be imported by eng/Versions.props $(MicrosoftTemplateEngineUtilsPackageVersion) $(MicrosoftTemplateSearchCommonPackageVersion) $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) + $(MicrosoftTestPlatformBuildPackageVersion) + $(MicrosoftTestPlatformCLIPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksConsolePackageVersion) + $(NuGetBuildTasksPackPackageVersion) + $(NuGetCommandLineXPlatPackageVersion) + $(NuGetCommandsPackageVersion) + $(NuGetCommonPackageVersion) + $(NuGetConfigurationPackageVersion) + $(NuGetCredentialsPackageVersion) + $(NuGetDependencyResolverCorePackageVersion) + $(NuGetFrameworksPackageVersion) + $(NuGetLibraryModelPackageVersion) + $(NuGetLocalizationPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetProjectModelPackageVersion) + $(NuGetProtocolPackageVersion) + $(NuGetVersioningPackageVersion) $(dotnetdevcertsPackageVersion) $(dotnetuserjwtsPackageVersion) @@ -190,11 +237,12 @@ This file should be imported by eng/Versions.props $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) $(MicrosoftAspNetCoreTestHostPackageVersion) $(MicrosoftBclAsyncInterfacesPackageVersion) - $(MicrosoftBuildTasksGitPackageVersion) $(MicrosoftDeploymentDotNetReleasesPackageVersion) $(MicrosoftDiaSymReaderPackageVersion) $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotnetWpfProjectTemplatesPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) $(MicrosoftExtensionsDependencyModelPackageVersion) $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) @@ -211,11 +259,6 @@ This file should be imported by eng/Versions.props $(MicrosoftNETSdkWindowsDesktopPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCorePlatformsPackageVersion) - $(MicrosoftSourceLinkAzureReposGitPackageVersion) - $(MicrosoftSourceLinkBitbucketGitPackageVersion) - $(MicrosoftSourceLinkCommonPackageVersion) - $(MicrosoftSourceLinkGitHubPackageVersion) - $(MicrosoftSourceLinkGitLabPackageVersion) $(MicrosoftWebXdtPackageVersion) $(MicrosoftWin32SystemEventsPackageVersion) $(MicrosoftWindowsDesktopAppInternalPackageVersion) @@ -244,61 +287,6 @@ This file should be imported by eng/Versions.props $(SystemWindowsExtensionsPackageVersion) $(NETStandardLibraryRefPackageVersion) - - $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) - - $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildLocalizationPackageVersion) - - $(MicrosoftFSharpCompilerPackageVersion) - - $(MicrosoftCodeAnalysisPackageVersion) - $(MicrosoftCodeAnalysisBuildClientPackageVersion) - $(MicrosoftCodeAnalysisCSharpPackageVersion) - $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) - $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) - $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) - $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) - $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) - $(MicrosoftNetCompilersToolsetPackageVersion) - $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) - - $(MicrosoftBuildNuGetSdkResolverPackageVersion) - $(NuGetBuildTasksPackageVersion) - $(NuGetBuildTasksConsolePackageVersion) - $(NuGetBuildTasksPackPackageVersion) - $(NuGetCommandLineXPlatPackageVersion) - $(NuGetCommandsPackageVersion) - $(NuGetCommonPackageVersion) - $(NuGetConfigurationPackageVersion) - $(NuGetCredentialsPackageVersion) - $(NuGetDependencyResolverCorePackageVersion) - $(NuGetFrameworksPackageVersion) - $(NuGetLibraryModelPackageVersion) - $(NuGetLocalizationPackageVersion) - $(NuGetPackagingPackageVersion) - $(NuGetProjectModelPackageVersion) - $(NuGetProtocolPackageVersion) - $(NuGetVersioningPackageVersion) - - $(MicrosoftNETTestSdkPackageVersion) - $(MicrosoftTestPlatformBuildPackageVersion) - $(MicrosoftTestPlatformCLIPackageVersion) - - $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) - $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) - $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) - - $(MicrosoftDotNetArcadeSdkPackageVersion) - $(MicrosoftDotNetBuildTasksInstallersPackageVersion) - $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) - $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) - $(MicrosoftDotNetHelixSdkPackageVersion) - $(MicrosoftDotNetSignToolPackageVersion) - $(MicrosoftDotNetXliffTasksPackageVersion) - $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftTestingPlatformPackageVersion) $(MSTestPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fcefc28ee6c6..86e972a9b013 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/msbuild - 6ef3f7b7870b0cdecd9773d4c7b3c58f206f554b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/msbuild - 6ef3f7b7870b0cdecd9773d4c7b3c58f206f554b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/fsharp - 5d23fef87847b07b40b1b67c9d826076d7cbaf3d + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/microsoft/vstest - 41f7799afd5767945acc16071ab64fa984bca274 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/microsoft/vstest - 41f7799afd5767945acc16071ab64fa984bca274 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/microsoft/vstest - 41f7799afd5767945acc16071ab64fa984bca274 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/razor - 43c97a1b8d5e97dd1dcc1e467079268f483ed903 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/razor - 43c97a1b8d5e97dd1dcc1e467079268f483ed903 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/razor - 43c97a1b8d5e97dd1dcc1e467079268f483ed903 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 @@ -514,43 +514,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d990..c282d3ae403a 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index ac5c69ffcac5..eea88e653c91 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 578705ee4dbd..bef4affa4a41 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -277,7 +277,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -510,7 +510,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -556,7 +556,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } diff --git a/global.json b/global.json index dc87e04b6c6c..79e3450feaac 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", + "dotnet": "10.0.101", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25611.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25611.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26072.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26072.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" diff --git a/src/Workloads/Manifests/Directory.Build.props b/src/Workloads/Manifests/Directory.Build.props index 89470be112a3..ecaa525cfa5a 100644 --- a/src/Workloads/Manifests/Directory.Build.props +++ b/src/Workloads/Manifests/Directory.Build.props @@ -12,6 +12,7 @@ false $(IsShipping) false + $(DotNet1xxWorkloadManifestVersion) diff --git a/src/Workloads/Manifests/manifest-packages.csproj b/src/Workloads/Manifests/manifest-packages.csproj index a2d2d219dec1..d18e946f2725 100644 --- a/src/Workloads/Manifests/manifest-packages.csproj +++ b/src/Workloads/Manifests/manifest-packages.csproj @@ -5,9 +5,14 @@ + + + <_VersionOverride Condition="'$(DotNet1xxWorkloadManifestVersion)' != ''">Version=$(DotNet1xxWorkloadManifestVersion) + + + Properties="ManifestDirectory=$(ManifestDirectory);$(_VersionOverride)" /> \ No newline at end of file diff --git a/src/Workloads/VSInsertion/workloads.csproj b/src/Workloads/VSInsertion/workloads.csproj index c4d5f777d8c5..3aa6a026e718 100644 --- a/src/Workloads/VSInsertion/workloads.csproj +++ b/src/Workloads/VSInsertion/workloads.csproj @@ -80,9 +80,10 @@ - - - + + + + @@ -94,13 +95,82 @@ - + + + <_ManifestProjectFiles Include="../Manifests/**/*.proj" Exclude="../Manifests/**/*.Transport.*/*.proj" /> + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -111,7 +181,35 @@ UseHardlinksIfPossible="true" /> - + + + + + + + + + + + + + + +