@@ -99,63 +99,63 @@ public void It_errors_out_when_RuntimeIdentifier_architecture_and_PlatformTarget
9999 const string PlatformTarget = "x86" ;
100100
101101 var testAsset = _testAssetsManager
102- . CopyTestAsset ( "HelloWorld" )
103- . WithSource ( )
104- . WithProjectChanges ( project =>
105- {
106- var ns = project . Root . Name . Namespace ;
107- var propertyGroup = project . Root . Elements ( ns + "PropertyGroup" ) . First ( ) ;
108- propertyGroup . Add ( new XElement ( ns + "RuntimeIdentifier" , RuntimeIdentifier ) ) ;
102+ . CopyTestAsset ( "HelloWorld" )
103+ . WithSource ( )
104+ . WithProjectChanges ( project =>
105+ {
106+ var ns = project . Root . Name . Namespace ;
107+ var propertyGroup = project . Root . Elements ( ns + "PropertyGroup" ) . First ( ) ;
108+ propertyGroup . Add ( new XElement ( ns + "RuntimeIdentifier" , RuntimeIdentifier ) ) ;
109109 propertyGroup . Add ( new XElement ( ns + "PlatformTarget" , PlatformTarget ) ) ;
110- } ) ;
110+ } ) ;
111111
112- var buildCommand = new BuildCommand ( testAsset ) ;
112+ var buildCommand = new BuildCommand ( testAsset ) ;
113113
114- buildCommand
115- . Execute ( )
116- . Should ( )
114+ buildCommand
115+ . Execute ( )
116+ . Should ( )
117117 . Fail ( )
118118 . And . HaveStdOutContaining ( string . Format (
119119 Strings . CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget ,
120120 RuntimeIdentifier ,
121121 PlatformTarget ) ) ;
122122 }
123123
124- [ Fact ]
125- public void It_succeeds_when_RuntimeIdentifier_and_PlatformTarget_mismatch_but_PT_is_AnyCPU ( )
126- {
127- var targetFramework = ToolsetInfo . CurrentTargetFramework ;
128- var runtimeIdentifier = EnvironmentInfo . GetCompatibleRid ( targetFramework ) ;
129- var testAsset = _testAssetsManager
130- . CopyTestAsset ( "HelloWorld" )
131- . WithSource ( )
132- . WithProjectChanges ( project =>
133- {
134- var ns = project . Root . Name . Namespace ;
135- var propertyGroup = project . Root . Elements ( ns + "PropertyGroup" ) . First ( ) ;
136- propertyGroup . Add ( new XElement ( ns + "RuntimeIdentifier" , runtimeIdentifier ) ) ;
137- propertyGroup . Add ( new XElement ( ns + "PlatformTarget" , "AnyCPU" ) ) ;
138- } ) ;
139-
140- var buildCommand = new BuildCommand ( testAsset ) ;
141-
142- buildCommand
143- . Execute ( )
144- . Should ( )
145- . Pass ( ) ;
146-
147- var outputDirectory = buildCommand . GetOutputDirectory ( targetFramework , runtimeIdentifier : runtimeIdentifier ) ;
148- var selfContainedExecutable = $ "HelloWorld{ Constants . ExeSuffix } ";
149-
150- string selfContainedExecutableFullPath = Path . Combine ( outputDirectory . FullName , selfContainedExecutable ) ;
124+ [ Fact ]
125+ public void It_succeeds_when_RuntimeIdentifier_and_PlatformTarget_mismatch_but_PT_is_AnyCPU ( )
126+ {
127+ var targetFramework = ToolsetInfo . CurrentTargetFramework ;
128+ var runtimeIdentifier = EnvironmentInfo . GetCompatibleRid ( targetFramework ) ;
129+ var testAsset = _testAssetsManager
130+ . CopyTestAsset ( "HelloWorld" )
131+ . WithSource ( )
132+ . WithProjectChanges ( project =>
133+ {
134+ var ns = project . Root . Name . Namespace ;
135+ var propertyGroup = project . Root . Elements ( ns + "PropertyGroup" ) . First ( ) ;
136+ propertyGroup . Add ( new XElement ( ns + "RuntimeIdentifier" , runtimeIdentifier ) ) ;
137+ propertyGroup . Add ( new XElement ( ns + "PlatformTarget" , "AnyCPU" ) ) ;
138+ } ) ;
139+
140+ var buildCommand = new BuildCommand ( testAsset ) ;
141+
142+ buildCommand
143+ . Execute ( )
144+ . Should ( )
145+ . Pass ( ) ;
146+
147+ var outputDirectory = buildCommand . GetOutputDirectory ( targetFramework , runtimeIdentifier : runtimeIdentifier ) ;
148+ var selfContainedExecutable = $ "HelloWorld{ Constants . ExeSuffix } ";
149+
150+ string selfContainedExecutableFullPath = Path . Combine ( outputDirectory . FullName , selfContainedExecutable ) ;
151151
152152 new RunExeCommand ( Log , selfContainedExecutableFullPath )
153- . Execute ( )
154- . Should ( )
155- . Pass ( )
156- . And
157- . HaveStdOutContaining ( "Hello World!" ) ;
158- }
153+ . Execute ( )
154+ . Should ( )
155+ . Pass ( )
156+ . And
157+ . HaveStdOutContaining ( "Hello World!" ) ;
158+ }
159159
160160 [ RequiresMSBuildVersionFact ( "17.0.0.32901" ) ]
161161 public void It_resolves_runtimepack_from_packs_folder ( )
@@ -317,7 +317,7 @@ static int Last2DigitsTo0(int versionBuild)
317317" ) ;
318318
319319 // Verify correct targeting pack version is resolved
320- var getValuesCommand = ( GetValuesCommand ) new GetValuesCommand ( testAsset , "TargetingPack" , GetValuesCommand . ValueType . Item )
320+ var getValuesCommand = ( GetValuesCommand ) new GetValuesCommand ( testAsset , "TargetingPack" , GetValuesCommand . ValueType . Item )
321321 . WithEnvironmentVariable ( EnvironmentVariableNames . WORKLOAD_MANIFEST_ROOTS , manifestRoot ) ;
322322 getValuesCommand . MetadataNames = new List < string > ( ) { "NuGetPackageId" , "NuGetPackageVersion" } ;
323323 getValuesCommand . DependsOnTargets = "ProcessFrameworkReferences" ;
@@ -349,29 +349,32 @@ static int Last2DigitsTo0(int versionBuild)
349349 testRuntimePack . metadata [ "NuGetPackageVersion" ] . Should ( ) . Be ( "1.0.42-abc" ) ;
350350 }
351351
352- [ Theory ]
352+ [ RequiresMSBuildVersionTheory ( "17.4.0.51802" ) ]
353353 [ InlineData ( "net6.0" ) ]
354- public void It_can_publish_runtime_specific_apps_with_library_dependencies_self_contained ( string targetFramework ) {
354+ public void It_can_publish_runtime_specific_apps_with_library_dependencies_self_contained ( string targetFramework )
355+ {
355356
356357 // create a basic library and a basic app, reference the library from the app and then
357358 // publish the app with a RID specified and self-contained.
358359 // verify that no warnings about missing the --self-contained flag are emitted.
359360 var rid = EnvironmentInfo . GetCompatibleRid ( targetFramework ) ;
360- var libProject = new TestProject ( "RidSelfContainedLib" ) {
361+ var libProject = new TestProject ( "RidSelfContainedLib" )
362+ {
361363 IsExe = false ,
362364 TargetFrameworks = targetFramework ,
363365 IsSdkProject = true
364366 } ;
365367 var createdLibProject = _testAssetsManager . CreateTestProject ( libProject ) ;
366- var appProject = new TestProject ( "RidSelfContainedApp" ) {
368+ var appProject = new TestProject ( "RidSelfContainedApp" )
369+ {
367370 IsExe = true ,
368371 TargetFrameworks = targetFramework ,
369372 IsSdkProject = true
370373 } ;
371374 appProject . ReferencedProjects . Add ( libProject ) ;
372375 var createdAppProject = _testAssetsManager . CreateTestProject ( appProject ) ;
373376 var publishCommand = new PublishCommand ( createdAppProject ) ;
374- publishCommand . Execute ( new [ ] { "-property:SelfContained=true" , "-property:_CommandLineDefinedSelfContained=true" , $ "-property:RuntimeIdentifier={ rid } ", "-property:_CommandLineDefinedRuntimeIdentifier=true" } ) . Should ( ) . Pass ( ) . And . NotHaveStdOutContaining ( "warning" ) ;
377+ publishCommand . Execute ( new [ ] { "-property:SelfContained=true" , "-property:_CommandLineDefinedSelfContained=true" , $ "-property:RuntimeIdentifier={ rid } ", "-property:_CommandLineDefinedRuntimeIdentifier=true" } ) . Should ( ) . Pass ( ) . And . NotHaveStdOutContaining ( "warning" ) ;
375378 }
376379 }
377380}
![dotnet-maestro[bot]](https://avatars.githubusercontent.com/in/16706?v=4&size=40){kind=avatar}
0 commit comments