From f09864694a5c2cae9bd52840133a5aea2567fcd6 Mon Sep 17 00:00:00 2001
From: Codrin Poienaru <copoiena@microsoft.com>
Date: Mon, 20 Mar 2023 15:07:54 +0100
Subject: [PATCH 1/2] Bumped TP version to 17.7.0

---
 eng/Versions.props                          | 2 +-
 scripts/build/TestPlatform.Settings.targets | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index a6b3891074..9e6b755be1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <!-- This repo version -->
-    <VersionPrefix>17.6.0</VersionPrefix>
+    <VersionPrefix>17.7.0</VersionPrefix>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
     <!-- Opt-out repo features -->
     <UsingToolXliff>false</UsingToolXliff>
diff --git a/scripts/build/TestPlatform.Settings.targets b/scripts/build/TestPlatform.Settings.targets
index 61bf4d9e8b..2173586527 100644
--- a/scripts/build/TestPlatform.Settings.targets
+++ b/scripts/build/TestPlatform.Settings.targets
@@ -5,7 +5,7 @@
     <!-- This version is read by vsts-prebuild.ps1 and is a base for the current version, this should be updated
     at the start of new iteration to the goal number. This is also used to version the local packages. This version needs to be statically
     readable when we read the file as xml, don't move it to a .props file, unless you change the build server process -->
-    <TPVersionPrefix>17.6.0</TPVersionPrefix>
+    <TPVersionPrefix>17.7.0</TPVersionPrefix>
     <LangVersion>preview</LangVersion>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisLevel>preview</AnalysisLevel>

From cfd30d13452d5fac57ceaaec92386cce72c9cfd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?= <me@jakubjares.com>
Date: Mon, 3 Apr 2023 13:21:20 +0200
Subject: [PATCH 2/2] Revert autogenerated change

---
 src/vstest.console/Resources/Resources.Designer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vstest.console/Resources/Resources.Designer.cs b/src/vstest.console/Resources/Resources.Designer.cs
index ddb4697dd3..06a734d6be 100644
--- a/src/vstest.console/Resources/Resources.Designer.cs
+++ b/src/vstest.console/Resources/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine....vstest.console.Resources {
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Resources {
     using System;