@@ -85,10 +85,12 @@ function Replace-Nugets
85
85
{
86
86
Write-Log " Replacing the nuget packages in the templates"
87
87
88
- $DesktopPackagesDir = Join-Path $env: MSTEST_TEMPLATES_DIR " Desktop\Packages"
89
- $UWPPackagesDir = Join-Path $env: MSTEST_TEMPLATES_DIR " UWP\Packages"
88
+ $CSDesktopPackagesDir = Join-Path $env: MSTEST_TEMPLATES_DIR " CSharp\Desktop\Packages"
89
+ $CSUWPPackagesDir = Join-Path $env: MSTEST_TEMPLATES_DIR " CSharp\UWP\Packages"
90
+ $VBDesktopPackagesDir = Join-Path $env: MSTEST_TEMPLATES_DIR " VisualBasic\Desktop\Packages"
91
+ $VBUWPPackagesDir = Join-Path $env: MSTEST_TEMPLATES_DIR " VisualBasic\UWP\Packages"
90
92
91
- $packagesDir = ($DesktopPackagesDir , $UWPPackagesDir )
93
+ $packagesDir = ($CSDesktopPackagesDir , $CSUWPPackagesDir , $VBDesktopPackagesDir , $VBUWPPackagesDir )
92
94
foreach ($dir in $packagesDir )
93
95
{
94
96
# Delete the old nuget packages.
@@ -115,16 +117,18 @@ function Edit-Templates
115
117
# 3. The vsixmanifest file version bump.
116
118
117
119
Write-Log " Editing vstemplate artifacts..."
118
- $DesktopProjectTemplateDir = Join-Path $env: MSTEST_TEMPLATES_DIR " Desktop\ProjectTemplates\CSharp\Test"
119
- $UWPProjectTemplateDir = Join-Path $env: MSTEST_TEMPLATES_DIR " UWP\ProjectTemplates\CSharp\Windows UAP"
120
+ $CSDesktopProjectTemplateDir = Join-Path $env: MSTEST_TEMPLATES_DIR " CSharp\Desktop\ProjectTemplates\CSharp\Test"
121
+ $CSUWPProjectTemplateDir = Join-Path $env: MSTEST_TEMPLATES_DIR " CSharp\UWP\ProjectTemplates\CSharp\Windows UAP"
122
+ $VBDesktopProjectTemplateDir = Join-Path $env: MSTEST_TEMPLATES_DIR " VisualBasic\Desktop\ProjectTemplates\VisualBasic\Test"
123
+ $VBUWPProjectTemplateDir = Join-Path $env: MSTEST_TEMPLATES_DIR " VisualBasic\UWP\ProjectTemplates\VisualBasic\Windows UAP"
120
124
121
125
$TestFrameworkvstemplateRegex = [regex ]" package id="" MSTest.TestFramework"" version=(.+) skipAssemblyReferences="" false"" "
122
126
$TestAdaptervstemplateRegex = [regex ]" package id="" MSTest.TestAdapter"" version=(.+) skipAssemblyReferences="" false"" "
123
127
124
128
$TestFrameworkvstemplateReplacement = " package id="" MSTest.TestFramework"" version="" $global :TestFrameworkVersion "" skipAssemblyReferences="" false"" "
125
129
$TestAdaptervstemplateReplacement = " package id="" MSTest.TestAdapter"" version="" $global :TestAdapterVersion "" skipAssemblyReferences="" false"" "
126
130
127
- $projecttemplatesDirs = @ ($DesktopProjectTemplateDir , $UWPProjectTemplateDir )
131
+ $projecttemplatesDirs = @ ($CSDesktopProjectTemplateDir , $CSUWPProjectTemplateDir , $VBDesktopProjectTemplateDir , $VBUWPProjectTemplateDir )
128
132
foreach ($templateDir in $projecttemplatesDirs )
129
133
{
130
134
$files = (Get-ChildItem - File $templateDir - Filter * .vstemplate).FullName
@@ -139,16 +143,18 @@ function Edit-Templates
139
143
}
140
144
141
145
Write-Log " Editing csproj artifacts..."
142
- $DesktopTemplateVSIXDir = Join-Path $env: MSTEST_TEMPLATES_DIR " Desktop"
143
- $UWPTemplateVSIXDir = Join-Path $env: MSTEST_TEMPLATES_DIR " UWP"
146
+ $CSDesktopTemplateVSIXDir = Join-Path $env: MSTEST_TEMPLATES_DIR " CSharp\Desktop"
147
+ $CSUWPTemplateVSIXDir = Join-Path $env: MSTEST_TEMPLATES_DIR " CSharp\UWP"
148
+ $VBDesktopTemplateVSIXDir = Join-Path $env: MSTEST_TEMPLATES_DIR " VisualBasic\Desktop"
149
+ $VBUWPTemplateVSIXDir = Join-Path $env: MSTEST_TEMPLATES_DIR " VisualBasic\UWP"
144
150
145
151
$TestFrameworkcsprojRegex = [regex ]" Content Include="" packages\\MSTest.TestFramework.(.+).nupkg"" "
146
152
$TestAdaptercsprojRegex = [regex ]" Content Include="" packages\\MSTest.TestAdapter.(.+).nupkg"" "
147
153
148
154
$TestFrameworkcsprojReplacement = " Content Include="" packages\MSTest.TestFramework.$global :TestFrameworkVersion .nupkg"" "
149
155
$TestAdaptercsprojReplacement = " Content Include="" packages\MSTest.TestAdapter.$global :TestAdapterVersion .nupkg"" "
150
156
151
- $templatesVSIXDirs = @ ($DesktopTemplateVSIXDir , $UWPTemplateVSIXDir )
157
+ $templatesVSIXDirs = @ ($CSDesktopTemplateVSIXDir , $CSUWPTemplateVSIXDir , $VBDesktopTemplateVSIXDir , $VBUWPTemplateVSIXDir )
152
158
foreach ($templateDir in $templatesVSIXDirs )
153
159
{
154
160
$files = (Get-ChildItem - File $templateDir - Filter * .csproj).FullName
@@ -164,11 +170,15 @@ function Edit-Templates
164
170
165
171
Write-Log " Editing the template version in the vsixmanifest with $TemplateVersion ..."
166
172
167
- $DesktopManifestRegex = [regex ]" Identity Id="" mstestProjectTemplate"" Version=(.+) Language"
168
- $UWPManifestRegex = [regex ]" Identity Id="" mstestUniversalProjectTemplate"" Version=(.+) Language"
173
+ $CSDesktopManifestRegex = [regex ]" Identity Id="" mstestProjectTemplate"" Version=(.+) Language"
174
+ $CSUWPManifestRegex = [regex ]" Identity Id="" mstestUniversalProjectTemplate"" Version=(.+) Language"
175
+ $VBDesktopManifestRegex = [regex ]" Identity Id="" MSTestDesktopVB.Microsoft.c6c7fff6-20cb-405d-9ad4-a60a6d0c55d9"" Version=(.+) Language"
176
+ $VBUWPManifestRegex = [regex ]" Identity Id="" MSTestUWPVB.Microsoft.3dc1d5cd-bbfb-456f-965e-5b962ad063d1"" Version=(.+) Language"
169
177
170
- $DesktopManifestReplacement = " Identity Id="" mstestProjectTemplate"" Version="" $TemplateVersion "" Language"
171
- $UWPManifestReplacement = " Identity Id="" mstestUniversalProjectTemplate"" Version="" $TemplateVersion "" Language"
178
+ $CSDesktopManifestReplacement = " Identity Id="" mstestProjectTemplate"" Version="" $TemplateVersion "" Language"
179
+ $CSUWPManifestReplacement = " Identity Id="" mstestUniversalProjectTemplate"" Version="" $TemplateVersion "" Language"
180
+ $VBDesktopManifestReplacement = " Identity Id="" MSTestDesktopVB.Microsoft.c6c7fff6-20cb-405d-9ad4-a60a6d0c55d9"" Version="" $TemplateVersion "" Language"
181
+ $VBUWPManifestReplacement = " Identity Id="" MSTestUWPVB.Microsoft.3dc1d5cd-bbfb-456f-965e-5b962ad063d1"" Version="" $TemplateVersion "" Language"
172
182
173
183
foreach ($templateDir in $templatesVSIXDirs )
174
184
{
@@ -177,8 +187,10 @@ function Edit-Templates
177
187
foreach ($file in $files ){
178
188
Write-Verbose " Editing $file "
179
189
$fileContent = Get-Content $file
180
- $fileContent = $fileContent -replace $DesktopManifestRegex , $DesktopManifestReplacement
181
- $fileContent = $fileContent -replace $UWPManifestRegex , $UWPManifestReplacement
190
+ $fileContent = $fileContent -replace $CSDesktopManifestRegex , $CSDesktopManifestReplacement
191
+ $fileContent = $fileContent -replace $CSUWPManifestRegex , $CSUWPManifestReplacement
192
+ $fileContent = $fileContent -replace $VBDesktopManifestRegex , $VBDesktopManifestReplacement
193
+ $fileContent = $fileContent -replace $VBUWPManifestRegex , $VBUWPManifestReplacement
182
194
Out-File $file - InputObject $fileContent - Encoding default
183
195
}
184
196
}
0 commit comments