Skip to content

Commit 750f982

Browse files
committed
Update dotnet build tests to add SelfContained explicitly when needed for 8 breaking change
1 parent 994404c commit 750f982

File tree

2 files changed

+22
-19
lines changed

2 files changed

+22
-19
lines changed

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs

+2
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,8 @@ static int Last2DigitsTo0(int versionBuild)
263263
RuntimeIdentifier = EnvironmentInfo.GetCompatibleRid()
264264
};
265265

266+
testProject.AdditionalProperties["SelfContained"] = "true";
267+
266268
// Set up test FrameworkReference that will use workload manifest to resolve versions
267269
testProject.ProjectChanges.Add(project =>
268270
{

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToCopyLocalDependencies.cs

+20-19
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public void It_copies_local_package_dependencies_on_build()
4242
testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "13.0.1"));
4343
testProject.PackageReferences.Add(new TestPackageReference("sqlite", "3.13.0"));
4444

45-
var testProjectInstance = _testAssetsManager
46-
.CreateTestProject(testProject);
45+
var testProjectInstance = _testAssetsManager
46+
.CreateTestProject(testProject);
4747

4848
var buildCommand = new BuildCommand(testProjectInstance);
4949

@@ -53,7 +53,7 @@ public void It_copies_local_package_dependencies_on_build()
5353

5454
var outputDirectory = buildCommand.GetOutputDirectory(testProject.TargetFrameworks);
5555

56-
var expectedFiles = new []
56+
var expectedFiles = new[]
5757
{
5858
$"{ProjectName}{Constants.ExeSuffix}",
5959
$"{ProjectName}.deps.json",
@@ -86,8 +86,8 @@ public void It_does_not_copy_local_package_dependencies_when_requested_not_to()
8686
testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "13.0.1"));
8787
testProject.PackageReferences.Add(new TestPackageReference("sqlite", "3.13.0"));
8888

89-
var testProjectInstance = _testAssetsManager
90-
.CreateTestProject(testProject);
89+
var testProjectInstance = _testAssetsManager
90+
.CreateTestProject(testProject);
9191

9292
var buildCommand = new BuildCommand(testProjectInstance);
9393

@@ -122,8 +122,8 @@ public void It_copies_local_specific_runtime_package_dependencies_on_build()
122122
testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "13.0.1"));
123123
testProject.PackageReferences.Add(new TestPackageReference("sqlite", "3.13.0"));
124124

125-
var testProjectInstance = _testAssetsManager
126-
.CreateTestProject(testProject);
125+
var testProjectInstance = _testAssetsManager
126+
.CreateTestProject(testProject);
127127

128128
var buildCommand = new BuildCommand(testProjectInstance);
129129

@@ -160,8 +160,8 @@ public void It_does_not_copy_local_package_dependencies_for_lib_projects()
160160
testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "13.0.1"));
161161
testProject.PackageReferences.Add(new TestPackageReference("sqlite", "3.13.0"));
162162

163-
var testProjectInstance = _testAssetsManager
164-
.CreateTestProject(testProject);
163+
var testProjectInstance = _testAssetsManager
164+
.CreateTestProject(testProject);
165165

166166
var buildCommand = new BuildCommand(testProjectInstance);
167167

@@ -193,8 +193,8 @@ public void It_copies_local_package_dependencies_for_lib_projects_when_requested
193193
testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "13.0.1"));
194194
testProject.PackageReferences.Add(new TestPackageReference("sqlite", "3.13.0"));
195195

196-
var testProjectInstance = _testAssetsManager
197-
.CreateTestProject(testProject);
196+
var testProjectInstance = _testAssetsManager
197+
.CreateTestProject(testProject);
198198

199199
var buildCommand = new BuildCommand(testProjectInstance);
200200

@@ -229,8 +229,8 @@ public void It_does_not_copy_local_package_dependencies_for_netstandard_projects
229229
testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "13.0.1"));
230230
testProject.PackageReferences.Add(new TestPackageReference("sqlite", "3.13.0"));
231231

232-
var testProjectInstance = _testAssetsManager
233-
.CreateTestProject(testProject);
232+
var testProjectInstance = _testAssetsManager
233+
.CreateTestProject(testProject);
234234

235235
var buildCommand = new BuildCommand(testProjectInstance);
236236

@@ -262,8 +262,8 @@ public void It_copies_local_package_dependencies_for_netstandard_projects_when_r
262262
testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "13.0.1"));
263263
testProject.PackageReferences.Add(new TestPackageReference("sqlite", "3.13.0"));
264264

265-
var testProjectInstance = _testAssetsManager
266-
.CreateTestProject(testProject);
265+
var testProjectInstance = _testAssetsManager
266+
.CreateTestProject(testProject);
267267

268268
var buildCommand = new BuildCommand(testProjectInstance);
269269

@@ -298,8 +298,8 @@ public void It_does_not_copy_local_runtime_dependencies_for_netframework_project
298298
testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "13.0.1"));
299299
testProject.PackageReferences.Add(new TestPackageReference("sqlite", "3.13.0"));
300300

301-
var testProjectInstance = _testAssetsManager
302-
.CreateTestProject(testProject);
301+
var testProjectInstance = _testAssetsManager
302+
.CreateTestProject(testProject);
303303

304304
var buildCommand = new BuildCommand(testProjectInstance);
305305

@@ -330,11 +330,12 @@ public void It_copies_local_all_assets_on_self_contained_build()
330330
};
331331

332332
testProject.AdditionalProperties.Add("RuntimeIdentifier", rid);
333+
testProject.AdditionalProperties["SelfContained"] = "true";
333334
testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "13.0.1"));
334335
testProject.PackageReferences.Add(new TestPackageReference("sqlite", "3.13.0"));
335336

336-
var testProjectInstance = _testAssetsManager
337-
.CreateTestProject(testProject);
337+
var testProjectInstance = _testAssetsManager
338+
.CreateTestProject(testProject);
338339

339340
var buildCommand = new BuildCommand(testProjectInstance);
340341

0 commit comments

Comments
 (0)