diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index ba45931481f4..8fe14b37545a 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -112,12 +112,10 @@ extends:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Svc-Public
- image: 1es-windows-2022-open
- os: windows
+ demands: ImageOverride -equals windows.vs2022preview.amd64.open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022
- os: windows
+ demands: ImageOverride -equals windows.vs2022preview.amd64
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
diff --git a/NuGet.config b/NuGet.config
index 536662e462f5..c186e37d4292 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,8 +4,7 @@
-
-
+
@@ -13,31 +12,13 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
@@ -57,35 +38,16 @@
-
-
-
-
-
-
-
-
-
-
+
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a11845cb9a65..a0fa2b39b88a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,70 +1,70 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 8413a0dffce5dd2f6d53d6156e25f3bf649da60b
+ 7de8a2867cf734967eef78d8e82902f3e84650b7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 8413a0dffce5dd2f6d53d6156e25f3bf649da60b
+ 7de8a2867cf734967eef78d8e82902f3e84650b7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 8413a0dffce5dd2f6d53d6156e25f3bf649da60b
+ 7de8a2867cf734967eef78d8e82902f3e84650b7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 8413a0dffce5dd2f6d53d6156e25f3bf649da60b
+ 7de8a2867cf734967eef78d8e82902f3e84650b7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 8413a0dffce5dd2f6d53d6156e25f3bf649da60b
+ 7de8a2867cf734967eef78d8e82902f3e84650b7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 8413a0dffce5dd2f6d53d6156e25f3bf649da60b
+ 7de8a2867cf734967eef78d8e82902f3e84650b7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 8413a0dffce5dd2f6d53d6156e25f3bf649da60b
+ 7de8a2867cf734967eef78d8e82902f3e84650b7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6c636980f730a30c3f5352cff80ce035ae53f016
+ b357f86ce3bce7c232ea242074b17bebdc50b543
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6c636980f730a30c3f5352cff80ce035ae53f016
+ b357f86ce3bce7c232ea242074b17bebdc50b543
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6c636980f730a30c3f5352cff80ce035ae53f016
+ b357f86ce3bce7c232ea242074b17bebdc50b543
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6c636980f730a30c3f5352cff80ce035ae53f016
+ b357f86ce3bce7c232ea242074b17bebdc50b543
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6c636980f730a30c3f5352cff80ce035ae53f016
+ b357f86ce3bce7c232ea242074b17bebdc50b543
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
189fbbd88d97dd6d65515ba2da05b62eab4e5039
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6c636980f730a30c3f5352cff80ce035ae53f016
+ b357f86ce3bce7c232ea242074b17bebdc50b543
-
- https://github.com/dotnet/runtime
- 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ b357f86ce3bce7c232ea242074b17bebdc50b543
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6c636980f730a30c3f5352cff80ce035ae53f016
+ b357f86ce3bce7c232ea242074b17bebdc50b543
https://github.com/dotnet/msbuild
@@ -83,9 +83,9 @@
5d69143fbe992d8fa33d5b83d5fdd5f4ed7bb4fc
-
- https://github.com/dotnet/format
- 0003cd7bf1ef4a96105e47accb90daaff189d2e2
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-format
+ 22541a9f44196f25a4b1b431f2dae01f92dc5e62
@@ -113,13 +113,13 @@
https://github.com/dotnet/roslyn
41a5af9d2c459a06c0795bf21a1c046200f375bf
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
@@ -174,66 +174,66 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
70ae3df4a6f3c92fb6b315afc405edd10ff38579
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- db4e5a36567b85765753af097e878d894a3552c9
+ fc5b097885ceb7463eb7163477356a39a359846f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- db4e5a36567b85765753af097e878d894a3552c9
+ fc5b097885ceb7463eb7163477356a39a359846f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- db4e5a36567b85765753af097e878d894a3552c9
+ fc5b097885ceb7463eb7163477356a39a359846f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- db4e5a36567b85765753af097e878d894a3552c9
+ fc5b097885ceb7463eb7163477356a39a359846f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- b660c1e83039451abe9d9190a7aabe87c03fd7ae
+ c9e44425226553e639116ff82698cfd2808f7769
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
https://github.com/dotnet/razor-compiler
@@ -250,21 +250,21 @@
503deb302b09bbd0ee3cb64e46117fa2d31af442
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f0f9de5692adf1c0576de062f93c6ab7b176433f
+ 827b96040e62e5aa47d829bfa61c000d315d4f2e
https://github.com/aspnet/xdt
diff --git a/eng/Versions.props b/eng/Versions.props
index c93f3e303de0..9527debe2dd4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -44,13 +44,13 @@
- 6.0.33
- 6.0.33-servicing.24366.10
- 6.0.33
+ 6.0.35
+ 6.0.35-servicing.24459.18
+ 6.0.35
$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)
- 6.0.0
- 6.0.33
- 6.0.33-servicing.24366.10
+ 6.0.1
+ 6.0.35
+ 6.0.35-servicing.24459.18
6.0.0-preview.7.21363.9
6.0.1
6.0.1
@@ -92,7 +92,7 @@
- 6.4.545403
+ 6.4.546803
@@ -119,11 +119,11 @@
- 6.0.425-rtm.24366.5
- 6.0.425
- 6.0.425
- 6.0.425
- 6.0.425
+ 6.0.427-rtm.24466.3
+ 6.0.427
+ 6.0.427
+ 6.0.427
+ 6.0.427
@@ -140,23 +140,23 @@
- 6.0.33-servicing.24379.5
- 6.0.33
- 6.0.33-servicing.24379.5
- 6.0.33-servicing.24379.5
- 6.0.33-servicing.24379.5
- 6.0.33
+ 6.0.35-servicing.24462.14
+ 6.0.35
+ 6.0.35-servicing.24462.14
+ 6.0.35-servicing.24462.14
+ 6.0.35-servicing.24462.14
+ 6.0.35
6.0.3-1.22213.1
6.0.3-1.22213.1
6.0.3-1.22213.1
- 6.0.33-servicing.24366.5
+ 6.0.35-servicing.24462.14
- 6.0.33-servicing.24366.6
+ 6.0.35-servicing.24463.5
diff --git a/src/Tests/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/src/Tests/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs
index 395329c4c90b..be5d06f21d2d 100644
--- a/src/Tests/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs
+++ b/src/Tests/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs
@@ -136,7 +136,7 @@ public void WhenRunOnWindowsDotnetHelpCommandShouldContainProperProcessInformati
public void WhenRunOnLinuxDotnetHelpCommandShouldContainProperProcessInformation()
{
var proc = HelpCommand.ConfigureProcess("https://aka.ms/dotnet-build");
- Assert.Equal("xdg-open", proc.StartInfo.FileName);
+ Assert.Contains("xdg-open", proc.StartInfo.FileName);
Assert.Equal("https://aka.ms/dotnet-build", proc.StartInfo.Arguments);
}
diff --git a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
index 17cb2df1388c..8c34ca38a86f 100644
--- a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
+++ b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
@@ -112,7 +112,7 @@ public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula()
.StartWith(firstTimeNonVerbUseMessage);
}
- [WindowsOnlyFact]
+ [WindowsOnlyFact(Skip="https://github.com/dotnet/sdk/issues/43328")]
public void ItShowsTheAppropriateMessageToTheUser()
{
@@ -160,7 +160,7 @@ public void ItDoesNotCreateAFirstUseSentinelFileNorAnAspNetCertificateSentinelFi
homeFolder.Should().NotExist();
}
- [WindowsOnlyFact]
+ [WindowsOnlyFact(Skip="https://github.com/dotnet/sdk/issues/43328")]
public void ItShowsTheTelemetryNoticeWhenInvokingACommandAfterInternalReportInstallSuccessHasBeenInvoked()
{
var dotnetFirstTime = new DotNetFirstTime();
diff --git a/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs b/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs
index 225bf7c325a6..4a407c450e07 100644
--- a/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs
+++ b/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs
@@ -71,6 +71,8 @@ public void When_dotnet_command_invokes_msbuild_with_diag_verbosity_Then_arg_is_
var cmd = new DotnetCommand(Log)
.WithWorkingDirectory(testInstance.Path)
+ .WithEnvironmentVariable("HelixAccessToken", "")
+ .WithEnvironmentVariable("SYSTEM_ACCESSTOKEN", "")
.Execute(command, "-v", "diag");
cmd.Should().Pass();