From 25b0dfdb756505d5a6ce1548b4ac760cc433cede Mon Sep 17 00:00:00 2001
From: Medeni Baykal <433724+Haplois@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:46:10 +0100
Subject: [PATCH] Fixed manifest publishing

---
 scripts/build/GenerateManifest.proj           | 1 +
 scripts/build/TestPlatform.Dependencies.props | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/build/GenerateManifest.proj b/scripts/build/GenerateManifest.proj
index 047b8c5ed4..1f62797d7b 100644
--- a/scripts/build/GenerateManifest.proj
+++ b/scripts/build/GenerateManifest.proj
@@ -14,6 +14,7 @@
         <MicrosoftDotNetBuildTasksFeedTaskDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MicrosoftDotNetBuildTasksFeedFilePath)tools/netcoreapp3.1/</MicrosoftDotNetBuildTasksFeedTaskDir>
 
         <PackagesPath Condition=" '$(PackagesPath)' == '' ">$(ArtifactsDir)\$(Configuration)\packages\</PackagesPath>
+        <PackagesPath Condition=" !$(PackagesPath.EndsWith('\')) ">$(PackagesPath)\</PackagesPath>
         <AssetManifestFilePath Condition=" '$(AssetManifestFilePath)' == '' ">$(PackagesPath)manifest\manifest.xml</AssetManifestFilePath>
         <PackagesToPublishPattern Condition=" '$(PackagesToPublishPattern)' == '' ">$(PackagesPath)*.nupkg</PackagesToPublishPattern>
         <FeedUrl Condition=" '$(FeedUrl)' == '' ">https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json</FeedUrl>
diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props
index 5190258c1c..815cdfe5bc 100644
--- a/scripts/build/TestPlatform.Dependencies.props
+++ b/scripts/build/TestPlatform.Dependencies.props
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VSSdkBuildToolsVersion>17.0.1600</VSSdkBuildToolsVersion>