Merged PR 1589: Test Suites Release 3.20.1.0

microsoft · Jan 8, 2020 · acb11be · acb11be
2 parents ca18119 + 6d58f2d
commit acb11be
Show file tree

Hide file tree

Showing 255 changed files with 6,597 additions and 4,477 deletions.
diff --git a/.gitignore b/.gitignore
@@ -99,3 +99,21 @@ TestSuites/RDP/Client/src/Deploy/CommonBatch.wxs
 TestSuites/MS-SMBD/src/Deploy/Batch.wxs
 TestSuites/MS-SMBD/src/Deploy/Bin.wxs
 TestSuites/MS-SMBD/src/Deploy/CommonBatch.wxs
+TestSuites/MS-ADFSPIP/src/Deploy/CommonBatch.wxs
+TestSuites/MS-ADOD/src/Deploy/CommonBatch.wxs
+TestSuites/MS-AZOD/src/Deploy/CommonBatch.wxs
+TestSuites/MS-SMB/src/Deploy/CommonBatch.wxs
+TestSuites/RDP/Server/src/Deploy/CommonBatch.wxs
+ProtoSDK/RDMA/include/NetworkDirect_DDK.zip
+ProtoSDK/RDMA/include/ndstatus.h
+ProtoSDK/RDMA/include/ndspi.h
+TestSuites/BranchCache/src/Deploy/CommonBatch.wxs
+TestSuites/ADFamily/src/Deploy/WINBLUE_TD_FILES.wxs
+TestSuites/ADFamily/src/Deploy/WIN2016_TD_FILES.wxs
+TestSuites/ADFamily/src/Deploy/WIN8_TD_FILES.wxs
+TestSuites/ADFamily/src/Deploy/CommonBatch.wxs
+TestSuites/BranchCache/src/Deploy/Scripts_FILES.wxs
+TestSuites/ADFamily/src/Deploy/COMMON_TD_FILES.wxs
+TestSuites/Kerberos/src/Deploy/CommonBatch.wxs
+TestSuites/FileServer/src/Deploy/CommonBatch.wxs
+TestSuites/FileServer/src/Deploy/TestSuiteScripts.wxs
diff --git a/AssemblyInfo/SharedAssemblyInfo.cs b/AssemblyInfo/SharedAssemblyInfo.cs
@@ -4,4 +4,4 @@
 using System.Reflection;
 
 [assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyVersion("3.19.9.0")]
+[assembly: AssemblyVersion("3.20.1.0")]
diff --git a/AssemblyInfo/resource.h b/AssemblyInfo/resource.h
@@ -10,7 +10,7 @@
 #define _BLDVER_H_
 #define COMPANY_NAME	"Microsoft"
 
-#define BUILD_VERSION	"3.19.9.0"
-#define INET_VER         3,19,9,0
+#define BUILD_VERSION	"3.20.1.0"
+#define INET_VER         3,20,1,0
 
 #endif
diff --git a/InstallPrerequisites/InstallPrerequisites.ps1 b/InstallPrerequisites/InstallPrerequisites.ps1
@@ -232,7 +232,7 @@ Function GetDownloadTools{
 	$downloadList = New-Object System.Collections.ArrayList;
 	foreach($item in $toolXML.Dependency.$ToolCategory.tool)
 	{
-		$ndTool = $tools | Where-Object{$_.Name -eq $item} | Select-Object $_
+		$ndTool = $tools | Where-Object{$_.Name -eq $item}
 		$index = $downloadList.Add($ndTool)
 	}
 

diff --git a/InstallPrerequisites/PrerequisitesConfig.xml b/InstallPrerequisites/PrerequisitesConfig.xml
@@ -1,9 +1,7 @@
 <Dependency>
   <tools>
-    <tool Type="Installer" name="MMA_x64" FileName="MessageAnalyzer64.msi" AppName="Microsoft Message Analyzer" version="4.0.8108.0" url="https://download.microsoft.com/download/2/8/3/283DE38A-5164-49DB-9883-9D1CC432174D/MessageAnalyzer64.msi" arguments="/q"/>
-    <tool Type="Installer" name="MMA_x86" FileName="MessageAnalyzer.msi" AppName="Microsoft Message Analyzer" version="4.0.8108.0" url="https://download.microsoft.com/download/2/8/3/283DE38A-5164-49DB-9883-9D1CC432174D/MessageAnalyzer.msi" arguments="/q"/>
     <tool Type="Installer" name="SE" FileName="SpecExplorer.msi" AppName="Spec Explorer 2010" version="3.5.3146.0" url="https://specexplorerteam.gallerycdn.vsassets.io/extensions/specexplorerteam/specexplorer2010visualstudiopowertool-5089/3.5.3146.0/1482139098514/36449/3/SpecExplorer.msi" arguments="/q"/>
-    <tool Type="Installer" name="PTF" FileName="ProtocolTestFramework.msi" AppName="Microsoft Protocol Test Framework" version="1.0.7000.0" BackwardCompatible="false" url="https://github.com/Microsoft/ProtocolTestFramework/releases/download/1.0.7000.0/ProtocolTestFrameworkInstaller.msi" arguments="/q"/>
+    <tool Type="Installer" name="PTF" FileName="ProtocolTestFramework.msi" AppName="Microsoft Protocol Test Framework" version="1.0.7500.0" BackwardCompatible="false" url="https://github.com/Microsoft/ProtocolTestFramework/releases/download/1.0.7500.0/ProtocolTestFrameworkInstaller.msi" arguments="/q"/>
     <tool Type="Installer" name="Wix314" FileName="Wix314.exe" AppName="WiX Toolset v3.14" version="3.14.0.2927" url="https://wixtoolset.org/downloads/v3.14.0.2927/wix314.exe" arguments="/q"/>
     <tool Type="Installer" name="OpenXMLSDK" FileName="OpenXMLSDK.msi" AppName="Open XML SDK 2.5" version="2.5.5631" url="https://download.microsoft.com/download/5/5/3/553C731E-9333-40FB-ADE3-E02DC9643B31/OpenXMLSDKV25.msi" arguments="/q"/>
     <tool Type="Custom" name="VisualStudio" FileName="vs_community.exe" url="https://aka.ms/vs/15/release/vs_community.exe" command="InstallVisualStudio.ps1" />
@@ -58,14 +56,12 @@
     <tool>VisualStudio</tool>
     <tool>PTF</tool>
     <tool>SE</tool>
-    <tool>MMA_x64</tool>
     <tool>OpenXMLSDK</tool>
   </ADFamily>
   <AZOD>
     <tool>VisualStudio</tool>
     <tool>SE</tool>
     <tool>PTF</tool>
-    <tool>MMA_x64</tool>
   </AZOD>
   <ADFSPIP>
     <tool>VisualStudio</tool>
@@ -76,6 +72,5 @@
     <tool>VisualStudio</tool>
     <tool>SE</tool>
     <tool>PTF</tool>
-    <tool>MMA_x64</tool>
   </ADOD>
 </Dependency>
diff --git a/ProtoSDK/MS-FSCC/FsccMessage.cs b/ProtoSDK/MS-FSCC/FsccMessage.cs