@@ -50,9 +50,6 @@ void Profile (ProjectBuilder builder, Action<ProjectBuilder> action, [CallerMemb
50
50
Assert . Fail ( $ "No timeout value found for a key of { caller } ") ;
51
51
}
52
52
53
- //TODO: Update baselines in MSBuildDeviceIntegration.csv, there is currently a slight performance regression in .NET 6
54
- expected += 500 ;
55
-
56
53
action ( builder ) ;
57
54
var actual = GetDurationFromBinLog ( builder ) ;
58
55
TestContext . Out . WriteLine ( $ "expected: { expected } ms, actual: { actual } ms") ;
@@ -203,27 +200,6 @@ public void Build_AndroidAsset_Change ()
203
200
}
204
201
}
205
202
206
- [ Test ]
207
- [ Retry ( Retry ) ]
208
- public void Build_Designer_Change ( )
209
- {
210
- var proj = CreateApplicationProject ( ) ;
211
- using ( var builder = CreateBuilderWithoutLogFile ( ) ) {
212
- builder . Target = "Build" ;
213
- builder . Build ( proj ) ;
214
- builder . AutomaticNuGetRestore = false ;
215
-
216
- // Change AndroidResource & run SetupDependenciesForDesigner
217
- proj . LayoutMain += $ "{ Environment . NewLine } <!--comment-->";
218
- proj . Touch ( "Resources\\ layout\\ Main.axml" ) ;
219
- var parameters = new [ ] { "DesignTimeBuild=True" , "AndroidUseManagedDesignTimeResourceGenerator=False" } ;
220
- builder . RunTarget ( proj , "SetupDependenciesForDesigner" , parameters : parameters ) ;
221
-
222
- // Profile AndroidResource change
223
- Profile ( builder , b => b . Build ( proj ) ) ;
224
- }
225
- }
226
-
227
203
[ Test ]
228
204
[ Retry ( Retry ) ]
229
205
public void Build_JLO_Change ( )
@@ -263,43 +239,9 @@ public void Build_AndroidManifest_Change ()
263
239
}
264
240
265
241
[ Test ]
266
- [ Retry ( Retry ) ]
267
- public void Build_CSProj_Change ( )
268
- {
269
- var proj = CreateApplicationProject ( ) ;
270
- using ( var builder = CreateBuilderWithoutLogFile ( ) ) {
271
- builder . Target = "Build" ;
272
- builder . Build ( proj ) ;
273
- builder . AutomaticNuGetRestore = false ;
274
-
275
- // Profile .csproj change
276
- proj . Sources . Add ( new BuildItem ( "None" , "Foo.txt" ) {
277
- TextContent = ( ) => "Bar" ,
278
- } ) ;
279
- Profile ( builder , b => b . Build ( proj ) ) ;
280
- }
281
- }
282
-
283
- static object [ ] XAML_Change = new object [ ] {
284
- new object [ ] {
285
- /* produceReferenceAssembly */ false ,
286
- /* install */ false ,
287
- } ,
288
- new object [ ] {
289
- /* produceReferenceAssembly */ true ,
290
- /* install */ false ,
291
- } ,
292
- new object [ ] {
293
- /* produceReferenceAssembly */ true ,
294
- /* install */ true ,
295
- } ,
296
- } ;
297
-
298
- [ Test ]
299
- [ TestCaseSource ( nameof ( XAML_Change ) ) ]
300
242
[ Category ( "UsesDevice" ) ]
301
243
[ Retry ( Retry ) ]
302
- public void Build_XAML_Change ( bool produceReferenceAssembly , bool install )
244
+ public void Build_XAML_Change ( [ Values ( true , false ) ] bool install )
303
245
{
304
246
if ( install ) {
305
247
AssertCommercialBuild ( ) ; // This test will fail without Fast Deployment
@@ -315,8 +257,6 @@ public void Build_XAML_Change (bool produceReferenceAssembly, bool install)
315
257
var caller = nameof ( Build_XAML_Change ) ;
316
258
if ( install ) {
317
259
caller = caller . Replace ( "Build" , "Install" ) ;
318
- } else if ( produceReferenceAssembly ) {
319
- caller += "_RefAssembly" ;
320
260
}
321
261
var app = CreateApplicationProject ( ) ;
322
262
app . ProjectName = "MyApp" ;
@@ -332,7 +272,7 @@ public void Build_XAML_Change (bool produceReferenceAssembly, bool install)
332
272
var lib = new DotNetStandard {
333
273
ProjectName = "MyLibrary" ,
334
274
Sdk = "Microsoft.NET.Sdk" ,
335
- TargetFramework = "netstandard2 .0" ,
275
+ TargetFramework = "net8 .0" , // Vanilla project
336
276
Sources = {
337
277
new BuildItem . Source ( "Bar.cs" ) {
338
278
TextContent = ( ) => "public class Bar { public Bar () { System.Console.WriteLine (" + count ++ + "); } }"
@@ -345,7 +285,6 @@ public void Build_XAML_Change (bool produceReferenceAssembly, bool install)
345
285
KnownPackages . XamarinForms ,
346
286
}
347
287
} ;
348
- lib . SetProperty ( "ProduceReferenceAssembly" , produceReferenceAssembly . ToString ( ) ) ;
349
288
app . References . Add ( new BuildItem . ProjectReference ( $ "..\\ { lib . ProjectName } \\ { lib . ProjectName } .csproj", lib . ProjectName , lib . ProjectGuid ) ) ;
350
289
351
290
using ( var libBuilder = CreateBuilderWithoutLogFile ( Path . Combine ( path , lib . ProjectName ) , isApp : false ) )
0 commit comments