Changeset 18226


Ignore:
Timestamp:
03/04/22 12:32:56 (2 months ago)
Author:
jkarder
Message:

#3017: updated build and test scripts to support VS 2022

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Build.ps1

    r18070 r18226  
    11# find ms build
    2 $programFilesX86Dir = ($Env:ProgramFiles, ${Env:ProgramFiles(x86)})[[bool]${Env:ProgramFiles(x86)}]
    3 $vsDir = [System.IO.Path]::Combine($programFilesX86Dir, "Microsoft Visual Studio")
    4 $years = @("2019", "2017")
     2$programFilesDirs = @($Env:ProgramFiles, ${Env:ProgramFiles(x86)})
     3$years = @("2022", "2019", "2017")
    54$editions = @("Enterprise", "Professional", "Community", "BuildTools")
    65$versions = @("Current", "15.0")
    76
    87$msBuildPath = $undefined
    9 :search Foreach ($year in $years) {
    10   $loc = [System.IO.Path]::Combine($vsDir, $year)
    11   Foreach ($edition in $editions) {
    12     $edLoc = [System.IO.Path]::Combine($loc, $edition, "MSBuild")
    13     Foreach ($version in $versions) {
    14       $binLoc = [System.IO.Path]::Combine($edLoc, $version, "Bin")
    15       $loc64 = [System.IO.Path]::Combine($binLoc, "amd64", "MSBuild.exe")
    16       $loc32 = [System.IO.Path]::Combine($binLoc, "MSBuild.exe")
    17 
    18       If ([System.IO.File]::Exists($loc64)) {
    19         $msBuildPath = $loc64
    20         Break search;
    21       }
    22       If ([System.IO.File]::Exists($loc32)) {
    23         $msBuildPath = $loc32
    24         Break search;
     8:search Foreach ($dir in $programFilesDirs) {
     9  $vsDir = [System.IO.Path]::Combine($dir, "Microsoft Visual Studio")
     10  Foreach ($year in $years) {
     11    $loc = [System.IO.Path]::Combine($vsDir, $year)
     12    Foreach ($edition in $editions) {
     13      $edLoc = [System.IO.Path]::Combine($loc, $edition, "MSBuild")
     14      Foreach ($version in $versions) {
     15        $binLoc = [System.IO.Path]::Combine($edLoc, $version, "Bin")
     16        $loc64 = [System.IO.Path]::Combine($binLoc, "amd64", "MSBuild.exe")
     17        $loc32 = [System.IO.Path]::Combine($binLoc, "MSBuild.exe")
     18
     19        If ([System.IO.File]::Exists($loc64)) {
     20          $msBuildPath = $loc64
     21          Break search;
     22        }
     23        If ([System.IO.File]::Exists($loc32)) {
     24          $msBuildPath = $loc32
     25          Break search;
     26        }
    2527      }
    2628    }
     
    144146# MIIRPwYJKoZIhvcNAQcCoIIRMDCCESwCAQExDzANBglghkgBZQMEAgEFADB5Bgor
    145147# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
    146 # KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCCkZQD98uHEu5cF
    147 # pqVi6UDP5wAnkH38IHKlZIY9T9KjMqCCDo4wggbaMIIEwqADAgECAhNoAAE6ILAh
     148# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCCLZ/JdonyPX9Cp
     149# TUV5DfnTZ07ydZrQLEzhh6BA4aW6eKCCDo4wggbaMIIEwqADAgECAhNoAAE6ILAh
    148150# JeBjaP8pAAEAATogMA0GCSqGSIb3DQEBCwUAMD4xEjAQBgoJkiaJk/IsZAEZFgJh
    149151# dDEVMBMGCgmSJomT8ixkARkWBWZob29lMREwDwYDVQQDEwhGSE9PZUNBMTAeFw0x
     
    227229# Y2j/KQABAAE6IDANBglghkgBZQMEAgEFAKCBhDAYBgorBgEEAYI3AgEMMQowCKAC
    228230# gAChAoAAMBkGCSqGSIb3DQEJAzEMBgorBgEEAYI3AgEEMBwGCisGAQQBgjcCAQsx
    229 # DjAMBgorBgEEAYI3AgEVMC8GCSqGSIb3DQEJBDEiBCBkKJAeYkI5WqZCigil5oKN
    230 # A/cYpXRiV+nHT9AINKF4HjANBgkqhkiG9w0BAQEFAASCAQCWxzzUAY2ruqDFVUHY
    231 # Zzifh1dpYkpzIidbJIVAiAKvlql14/pqLSsZ64GS+qAph0F43FHYodilL50zydnp
    232 # sv6WRC6GqE4ida5vwuWl22R7t4gZx5ZIG73HPySUzKawFigUZllT4CQfW7qEBf0g
    233 # N42mOR0MnkGTsJiFQSpD98UHpiUaSNWSMAEsWeEiw0eVxiDOIQGTc62RtAPg4EUt
    234 # fIOlbRUvQAgwC6yAdmqx0fA0ADAV0aO9c6h9jyf6kYA0TeAc8o/LtBtHULCLj5HT
    235 # YllKIp7BZCLGQKVbKvmdxsdIGT8ajElKowM1MTGcLQYaGdzGTRgDNnTjzVsmV1Q7
    236 # s7qn
     231# DjAMBgorBgEEAYI3AgEVMC8GCSqGSIb3DQEJBDEiBCB8JQqTFBBqCVI0KaLbaLg0
     232# flx9+g0aPjepZMuhphj42jANBgkqhkiG9w0BAQEFAASCAQAPafrPJVGSrB1pcCdm
     233# 7V2X2/bYyfBFxOaHI2p79UIHt5Z+PfDWuC5+ikrODQ+6FmGErfy/RN2Z1uueNUt5
     234# aMhCn86vLGehThRoEGL+YDJg+/WKplowdHGkNB65yXC4CXe9NZLs02EVlljIO0yh
     235# g8ITIZI1l1+njG7G8TMCwyLf/AAHaZpNZMlKSO1P0PQi8D2ggo3G0EwogPyN4AvJ
     236# X877LhU4jEzX8lEouMXhilz8UQBrxrdXXWIbOUCNnXeIDVIUqf4HnsGnWGlwcQQb
     237# BPUTwKveuKWSUHkk2zhMFAhuRNfm6KLBZaKdcVWaXEu66SChg68m4xjlLwy5jC+E
     238# K2XI
    237239# SIG # End signature block
  • trunk/Test.ps1

    r18070 r18226  
    11# find ms build
    2 $programFilesX86Dir = ($Env:ProgramFiles, ${Env:ProgramFiles(x86)})[[bool]${Env:ProgramFiles(x86)}]
    3 $vsDir = [System.IO.Path]::Combine($programFilesX86Dir, "Microsoft Visual Studio")
    4 $years = @("2019", "2017")
     2$programFilesDirs = @($Env:ProgramFiles, ${Env:ProgramFiles(x86)})
     3$years = @("2022", "2019", "2017")
    54$editions = @("Enterprise", "Professional", "Community", "BuildTools")
    65$versions = @("Current", "15.0")
     
    87$msBuildPath = $undefined
    98$vstestPath = $undefined
    10 :search Foreach ($year in $years) {
    11   $loc = [System.IO.Path]::Combine($vsDir, $year)
    12   Foreach ($edition in $editions) {
    13     $edLoc = [System.IO.Path]::Combine($loc, $edition, "MSBuild")
    14     Foreach ($version in $versions) {
    15       $binLoc = [System.IO.Path]::Combine($edLoc, $version, "Bin")
    16       $loc64 = [System.IO.Path]::Combine($binLoc, "amd64", "MSBuild.exe")
    17       $loc32 = [System.IO.Path]::Combine($binLoc, "MSBuild.exe")
    18 
    19       If ([System.IO.File]::Exists($loc64)) {
    20         $msBuildPath = $loc64
    21         $vstestPath = [System.IO.Path]::Combine($loc, $edition, "Common7", "IDE", "CommonExtensions", "Microsoft", "TestWindow", "vstest.console.exe")
    22         Break search;
    23       }
    24       If ([System.IO.File]::Exists($loc32)) {
    25         $msBuildPath = $loc32
    26         $vstestPath = [System.IO.Path]::Combine($loc, $edition, "Common7", "IDE", "CommonExtensions", "Microsoft", "TestWindow", "vstest.console.exe")
    27         Break search;
     9:search Foreach ($dir in $programFilesDirs) {
     10  $vsDir = [System.IO.Path]::Combine($dir, "Microsoft Visual Studio")
     11  Foreach ($year in $years) {
     12    $loc = [System.IO.Path]::Combine($vsDir, $year)
     13    Foreach ($edition in $editions) {
     14      $edLoc = [System.IO.Path]::Combine($loc, $edition, "MSBuild")
     15      Foreach ($version in $versions) {
     16        $binLoc = [System.IO.Path]::Combine($edLoc, $version, "Bin")
     17        $loc64 = [System.IO.Path]::Combine($binLoc, "amd64", "MSBuild.exe")
     18        $loc32 = [System.IO.Path]::Combine($binLoc, "MSBuild.exe")
     19
     20        If ([System.IO.File]::Exists($loc64)) {
     21          $msBuildPath = $loc64
     22          $vstestPath = [System.IO.Path]::Combine($loc, $edition, "Common7", "IDE", "CommonExtensions", "Microsoft", "TestWindow", "vstest.console.exe")
     23          Break search;
     24        }
     25        If ([System.IO.File]::Exists($loc32)) {
     26          $msBuildPath = $loc32
     27          $vstestPath = [System.IO.Path]::Combine($loc, $edition, "Common7", "IDE", "CommonExtensions", "Microsoft", "TestWindow", "vstest.console.exe")
     28          Break search;
     29        }
    2830      }
    2931    }
     
    159161
    160162& $vstestPath "bin\$testcontainer" /Framework:framework40 /Platform:$testplatform /TestCaseFilter:"TestCategory=$testcategory"
     163
     164""
     165
     166Write-Host -NoNewline "Press any key to continue ... "
     167
     168[void][System.Console]::ReadKey($true)
     169
    161170# SIG # Begin signature block
    162171# MIIRPwYJKoZIhvcNAQcCoIIRMDCCESwCAQExDzANBglghkgBZQMEAgEFADB5Bgor
    163172# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
    164 # KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAJ0I/t/xZNoRef
    165 # SWG1a9MeW996RfVwX+NKpwaPNeHob6CCDo4wggbaMIIEwqADAgECAhNoAAE6ILAh
     173# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCBtCktnwnVbhfUW
     174# rrODW7qXn4ckTNXv9s/As4v50Ft51aCCDo4wggbaMIIEwqADAgECAhNoAAE6ILAh
    166175# JeBjaP8pAAEAATogMA0GCSqGSIb3DQEBCwUAMD4xEjAQBgoJkiaJk/IsZAEZFgJh
    167176# dDEVMBMGCgmSJomT8ixkARkWBWZob29lMREwDwYDVQQDEwhGSE9PZUNBMTAeFw0x
     
    245254# Y2j/KQABAAE6IDANBglghkgBZQMEAgEFAKCBhDAYBgorBgEEAYI3AgEMMQowCKAC
    246255# gAChAoAAMBkGCSqGSIb3DQEJAzEMBgorBgEEAYI3AgEEMBwGCisGAQQBgjcCAQsx
    247 # DjAMBgorBgEEAYI3AgEVMC8GCSqGSIb3DQEJBDEiBCBzUedLfOrfI8C+s+K6rJYY
    248 # VhIOL3BMg83zouWpb+G6TTANBgkqhkiG9w0BAQEFAASCAQAF0ha6sm0rEfVTS6ot
    249 # vyp0nokYc/jNw174T/jZgKM2g4t+TehmVgYZAiimkBCidURXpKaNf3URjmeGY2hA
    250 # /Yl1oKG+kR0SmUgB1qryGqMIn1o0zXJKSY0XtahKFleDXFkhYCbLxr6Nq/i0Yfbd
    251 # MsfX3soN/aG6N9bRq9RviS1K6O8X8S4ZWYKkdcf0LT5ANqVZukvHcgSCHCeo/osl
    252 # 3EoTo/n1i2uo0z8MtrhMiqaKj0Rg48ZQtEO3ee/OGBFRDZcnptkSNpDOreyPFKx3
    253 # 9TzLOHwdmFSC85eAtDt7ciWzoLA0Z2UrbKIRGrXDDRQRlvGgFOtf5dfQFJuMRwKy
    254 # Qp84
     256# DjAMBgorBgEEAYI3AgEVMC8GCSqGSIb3DQEJBDEiBCDDzy6RhRdWhlEvoZ9lSBH8
     257# 1bgdAp3kSHSn3I9JzPC1gzANBgkqhkiG9w0BAQEFAASCAQCKOmizxpz/TOCEhRPY
     258# f1KVbo9UBYP3YT7g/TNdUCcI0ITkyQkXI2dowJACBzAyb50EqARONPobf81koPhh
     259# /AW0jvak1bXrLRHE6DwitNCBLwTLNkZ2Zn3yUBjB4OwIGyUoX+4af9hC9+G6eoTt
     260# aE5vbVnZOZBsultoeKpso5QgL5CPEnqkMXsV1p3MCF2ryD5lHKLEHXvF4A3bfRkz
     261# y8sVKscEuRjOMhvCx2qjNLpRFGf5Ppd6hzCIw/e67c/nGUCh6GflK9UfZanW4Gn7
     262# NQ9KUd9NZXJ8Bo3bEU9Co51zGXQY18atrTX0AaYizZ/MBCtYOU7x15BtQzraFAiL
     263# PHJ6
    255264# SIG # End signature block
Note: See TracChangeset for help on using the changeset viewer.