Skip to content

Commit eb070fa

Browse files
surayya-MSsurayya-MS
authored
Bump BootstrapSdkVersion (#11797)
### Context We update the `BootstrapSdkVersion` manually. The current version is old preview version. ### Changes Made Updating to `9.0.203` ### Testing Ran `build.cmd`on Windows and `build.sh` on macOS. ### Notes
2 parents 5ecd83a + 0596f6f commit eb070fa

22 files changed

+12
-329
lines changed

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<NuGetBuildTasksVersion>6.15.0-preview.1.37</NuGetBuildTasksVersion>
8686
</PropertyGroup>
8787
<PropertyGroup Condition="!$(TargetFramework.StartsWith('net4'))">
88-
<BootstrapSdkVersion>9.0.200-preview.0.24603.3</BootstrapSdkVersion>
88+
<BootstrapSdkVersion>9.0.203</BootstrapSdkVersion>
8989
</PropertyGroup>
9090
<Target Name="OverrideArcadeFileVersion" AfterTargets="_InitializeAssemblyVersion">
9191
<!-- See https://github.com/dotnet/arcade/issues/3386

‎src/Build.OM.UnitTests/ObjectModelRemoting/Helpers/ViewValidation.construction.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,7 @@ public ElementLinkPair<CT> QuerySingleChildrenWithValidation<CT>(Func<T, IEnumer
207207

208208
internal sealed class ProjectXmlPair : ElementLinkPair<ProjectRootElement>
209209
{
210-
private ProjectPair Project { get; }
211-
public ProjectXmlPair(ProjectPair pair) : base(null, pair.View.Xml, pair.Real.Xml) { this.Project = pair; this.PRE = this; }
210+
public ProjectXmlPair(ProjectPair pair) : base(null, pair.View.Xml, pair.Real.Xml) { this.PRE = this; }
212211
public ProjectXmlPair(ProjectRootElement viewXml, ProjectRootElement realXml) : base(null, viewXml, realXml) { this.PRE = this; }
213212

214213
public ElementLinkPair<CT> CreateWithVerify<CT>(Func<ProjectRootElement, CT> creator)

‎src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/DirectlyRemotedClasses.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,5 @@ public RemotedResolvedImport(ResolvedImport resolvedImport, ProjectCollectionLin
4040
public SdkResult SdkResult { get; }
4141

4242
public bool IsImported { get; }
43-
44-
private ResolvedImport Import(ProjectCollectionLinker importer)
45-
{
46-
var importElement = (ProjectImportElement)importer.Import<ProjectElement, MockProjectImportElementLinkRemoter>(this.ImportingElement);
47-
var projectElement = (ProjectRootElement)importer.Import<ProjectElement, MockProjectRootElementLinkRemoter>(this.ImportedProject);
48-
return importer.LinkFactory.Create(importElement, projectElement, 0, this.SdkResult, this.IsImported);
49-
}
5043
}
5144
}

‎src/Build.UnitTests/BackEnd/BuildManager_Logging_Tests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,12 @@ public class BuildManager_Logging_Tests : IDisposable
5959
private readonly ProjectCollection _projectCollection;
6060

6161
private readonly TestEnvironment _env;
62-
private readonly ITestOutputHelper _output;
6362

6463
/// <summary>
6564
/// SetUp
6665
/// </summary>
6766
public BuildManager_Logging_Tests(ITestOutputHelper output)
6867
{
69-
_output = output;
7068
// Ensure that any previous tests which may have been using the default BuildManager do not conflict with us.
7169
BuildManager.DefaultBuildManager.Dispose();
7270

‎src/Build.UnitTests/BackEnd/BuildRequestEngine_Tests.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public List<FullyQualifiedBuildRequest[]> NewRequests
5252
}
5353

5454

55-
private IBuildComponentHost _host;
5655
private Thread _builderThread;
5756
private BuildRequestEntry _entry;
5857
private AutoResetEvent _continueEvent;
@@ -224,12 +223,10 @@ public void WaitForCancelCompletion()
224223

225224
public void InitializeComponent(IBuildComponentHost host)
226225
{
227-
_host = host;
228226
}
229227

230228
public void ShutdownComponent()
231229
{
232-
_host = null;
233230
}
234231

235232
#endregion
@@ -255,13 +252,11 @@ private ProjectInstance CreateStandinProject()
255252
private BuildResult _requestComplete_Result;
256253

257254
private AutoResetEvent _requestResumedEvent;
258-
private BuildRequest _requestResumed_Request;
259255

260256
private AutoResetEvent _newRequestEvent;
261257
private BuildRequestBlocker _newRequest_Request;
262258

263259
private AutoResetEvent _engineStatusChangedEvent;
264-
private BuildRequestEngineStatus _engineStatusChanged_Status;
265260

266261
private AutoResetEvent _newConfigurationEvent;
267262
private BuildRequestConfiguration _newConfiguration_Config;
@@ -270,7 +265,6 @@ private ProjectInstance CreateStandinProject()
270265
private Exception _engineException_Exception;
271266

272267
private AutoResetEvent _engineResourceRequestEvent;
273-
private ResourceRequest _engineResourceRequest_Request;
274268

275269
private IBuildRequestEngine _engine;
276270
private IConfigCache _cache;
@@ -560,7 +554,6 @@ private void Engine_RequestComplete(BuildRequest request, BuildResult result)
560554
/// <param name="request">The request being resumed</param>
561555
private void Engine_RequestResumed(BuildRequest request)
562556
{
563-
_requestResumed_Request = request;
564557
_requestResumedEvent.Set();
565558
}
566559

@@ -580,7 +573,6 @@ private void Engine_NewRequest(BuildRequestBlocker blocker)
580573
/// <param name="newStatus">The new status for the engine</param>
581574
private void Engine_EngineStatusChanged(BuildRequestEngineStatus newStatus)
582575
{
583-
_engineStatusChanged_Status = newStatus;
584576
_engineStatusChangedEvent.Set();
585577
}
586578

@@ -610,7 +602,6 @@ private void Engine_Exception(Exception e)
610602
/// <param name="request">The resource request</param>
611603
private void Engine_ResourceRequest(ResourceRequest request)
612604
{
613-
_engineResourceRequest_Request = request;
614605
_engineResourceRequestEvent.Set();
615606
}
616607
}

‎src/Build.UnitTests/BackEnd/MockTaskBuilder.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ namespace Microsoft.Build.UnitTests.BackEnd
1919
/// </summary>
2020
internal sealed class MockTaskBuilder : ITaskBuilder, IBuildComponent
2121
{
22-
/// <summary>
23-
/// The component host.
24-
/// </summary>
25-
private IBuildComponentHost _host;
26-
2722
/// <summary>
2823
/// The current task number.
2924
/// </summary>
@@ -137,15 +132,13 @@ public Task<WorkUnitResult> ExecuteTask(TargetLoggingContext targetLoggingContex
137132
/// <param name="host">The component host</param>
138133
public void InitializeComponent(IBuildComponentHost host)
139134
{
140-
_host = host;
141135
}
142136

143137
/// <summary>
144138
/// Shuts down the component.
145139
/// </summary>
146140
public void ShutdownComponent()
147141
{
148-
_host = null;
149142
}
150143

151144
#endregion

‎src/Build.UnitTests/BackEnd/RequestBuilder_Tests.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ private NodeLoggingContext GetNodeLoggingContext()
339339

340340
internal sealed class TestTargetBuilder : ITargetBuilder, IBuildComponent
341341
{
342-
private IBuildComponentHost _host;
343342
private IResultsCache _cache;
344343
private FullyQualifiedBuildRequest[] _newRequests;
345344
private IRequestBuilderCallback _requestBuilderCallback;
@@ -405,13 +404,11 @@ public Task<BuildResult> BuildTargets(ProjectLoggingContext loggingContext, Buil
405404

406405
public void InitializeComponent(IBuildComponentHost host)
407406
{
408-
_host = host;
409407
_cache = new ResultsCache();
410408
}
411409

412410
public void ShutdownComponent()
413411
{
414-
_host = null;
415412
_cache = null;
416413
}
417414
#endregion

‎src/Build.UnitTests/BackEnd/SdkResultOutOfProc_Tests.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,32 +35,19 @@ public class SdkResultOutOfProc_Tests : IDisposable
3535
/// </summary>
3636
private readonly BuildManager _buildManager;
3737

38-
/// <summary>
39-
/// The build parameters.
40-
/// </summary>
41-
private readonly BuildParameters _parameters;
42-
4338
/// <summary>
4439
/// The project collection used.
4540
/// </summary>
4641
private readonly ProjectCollection _projectCollection;
4742

4843
private readonly TestEnvironment _env;
49-
private readonly ITestOutputHelper _output;
5044

5145
public SdkResultOutOfProc_Tests(ITestOutputHelper output)
5246
{
53-
_output = output;
5447
// Ensure that any previous tests which may have been using the default BuildManager do not conflict with us.
5548
BuildManager.DefaultBuildManager.Dispose();
5649

5750
_logger = new MockLogger(output);
58-
_parameters = new BuildParameters
59-
{
60-
ShutdownInProcNodeOnBuildFinish = true,
61-
Loggers = new ILogger[] { _logger },
62-
EnableNodeReuse = false
63-
};
6451
_buildManager = new BuildManager();
6552
_projectCollection = new ProjectCollection();
6653

‎src/Build.UnitTests/BackEnd/TaskBuilder_Tests.cs

Lines changed: 1 addition & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,14 @@ namespace Microsoft.Build.UnitTests.BackEnd
3232
/// </summary>
3333
public class TaskBuilder_Tests : ITargetBuilderCallback
3434
{
35-
/// <summary>
36-
/// The mock component host and logger
37-
/// </summary>
38-
private MockHost _host;
39-
4035
private readonly ITestOutputHelper _testOutput;
4136

42-
/// <summary>
43-
/// The temporary project we use to run the test
44-
/// </summary>
45-
private ProjectInstance _testProject;
46-
4737
/// <summary>
4838
/// Prepares the environment for the test.
4939
/// </summary>
5040
public TaskBuilder_Tests(ITestOutputHelper output)
5141
{
52-
_host = new MockHost();
5342
_testOutput = output;
54-
_testProject = CreateTestProject();
5543
}
5644

5745
/*********************************************************************************
@@ -1098,7 +1086,6 @@ private Project CreateSTATestProject(bool requireSTA, bool failTask, bool throwE
10981086

10991087
return project;
11001088
}
1101-
#endif
11021089

11031090
/// <summary>
11041091
/// Helper to create the STA test task.
@@ -1172,80 +1159,7 @@ public ITaskHost HostObject
11721159
}";
11731160
return CustomTaskHelper.GetAssemblyForTask(taskContents);
11741161
}
1175-
1176-
/// <summary>
1177-
/// Creates a test project.
1178-
/// </summary>
1179-
/// <returns>The project.</returns>
1180-
private ProjectInstance CreateTestProject()
1181-
{
1182-
string projectFileContents = ObjectModelHelpers.CleanupFileContents(@"
1183-
<Project ToolsVersion='msbuilddefaulttoolsversion' xmlns='msbuildnamespace'>
1184-
1185-
<ItemGroup>
1186-
<Compile Include='b.cs' />
1187-
<Compile Include='c.cs' />
1188-
</ItemGroup>
1189-
1190-
<ItemGroup>
1191-
<Reference Include='System' />
1192-
</ItemGroup>
1193-
1194-
<Target Name='Empty' />
1195-
1196-
<Target Name='Skip' Inputs='testProject.proj' Outputs='testProject.proj' />
1197-
1198-
<Target Name='Error' >
1199-
<ErrorTask1 ContinueOnError='True'/>
1200-
<ErrorTask2 ContinueOnError='False'/>
1201-
<ErrorTask3 />
1202-
<OnError ExecuteTargets='Foo'/>
1203-
<OnError ExecuteTargets='Bar'/>
1204-
</Target>
1205-
1206-
<Target Name='Foo' Inputs='foo.cpp' Outputs='foo.o'>
1207-
<FooTask1/>
1208-
</Target>
1209-
1210-
<Target Name='Bar'>
1211-
<BarTask1/>
1212-
</Target>
1213-
1214-
<Target Name='Baz' DependsOnTargets='Bar'>
1215-
<BazTask1/>
1216-
<BazTask2/>
1217-
</Target>
1218-
1219-
<Target Name='Baz2' DependsOnTargets='Bar;Foo'>
1220-
<Baz2Task1/>
1221-
<Baz2Task2/>
1222-
<Baz2Task3/>
1223-
</Target>
1224-
1225-
<Target Name='DepSkip' DependsOnTargets='Skip'>
1226-
<DepSkipTask1/>
1227-
<DepSkipTask2/>
1228-
<DepSkipTask3/>
1229-
</Target>
1230-
1231-
<Target Name='DepError' DependsOnTargets='Foo;Skip;Error'>
1232-
<DepSkipTask1/>
1233-
<DepSkipTask2/>
1234-
<DepSkipTask3/>
1235-
</Target>
1236-
1237-
</Project>
1238-
");
1239-
1240-
IConfigCache cache = (IConfigCache)_host.GetComponent(BuildComponentType.ConfigCache);
1241-
BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("testfile", new Dictionary<string, string>(), "3.5", Array.Empty<string>(), null), "2.0");
1242-
using ProjectFromString projectFromString = new(projectFileContents);
1243-
Project project = projectFromString.Project;
1244-
config.Project = project.CreateProjectInstance();
1245-
cache.AddConfiguration(config);
1246-
1247-
return config.Project;
1248-
}
1162+
#endif
12491163

12501164
/// <summary>
12511165
/// The mock component host object.

‎src/Build.UnitTests/BackEnd/TaskExecutionHost_Tests.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,18 +1302,6 @@ private void ValidateOutputItem(string outputName, string value)
13021302
Assert.Equal(value, _bucket.Lookup.GetItems("output").First().EvaluatedInclude);
13031303
}
13041304

1305-
/// <summary>
1306-
/// Helper method for tests
1307-
/// </summary>
1308-
private void ValidateOutputItem(string outputName, ITaskItem value)
1309-
{
1310-
Assert.True(_host.GatherTaskOutputs(outputName, ElementLocation.Create(".", 1, 1), true, "output"));
1311-
Assert.True(_outputsReadFromTask.ContainsKey(outputName));
1312-
1313-
Assert.Single(_bucket.Lookup.GetItems("output"));
1314-
Assert.Equal(0, TaskItemComparer.Instance.Compare(value, new TaskItem(_bucket.Lookup.GetItems("output").First())));
1315-
}
1316-
13171305
/// <summary>
13181306
/// Helper method for tests
13191307
/// </summary>

‎src/Build.UnitTests/Definition/ToolsetRegistryReader_Tests.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ namespace Microsoft.Build.UnitTests.Definition
2626
/// </summary>
2727
public class ToolsetRegistryReader_Tests : IDisposable
2828
{
29-
// The registry key that is passed as the baseKey parameter to the ToolsetRegistryReader class
30-
private RegistryKey _testRegistryKey = null;
3129
// Subkey "3.5"
3230
private RegistryKey _currentVersionRegistryKey = null;
3331
// Subkey "ToolsVersions"
@@ -49,7 +47,6 @@ public class ToolsetRegistryReader_Tests : IDisposable
4947
public ToolsetRegistryReader_Tests()
5048
{
5149
DeleteTestRegistryKey();
52-
_testRegistryKey = Registry.CurrentUser.CreateSubKey(testRegistryPath);
5350
_currentVersionRegistryKey = Registry.CurrentUser.CreateSubKey(testRegistryPath + "\\" + Constants.AssemblyVersion);
5451
_toolsVersionsRegistryKey = Registry.CurrentUser.CreateSubKey(testRegistryPath + "\\ToolsVersions");
5552

‎src/Build.UnitTests/Evaluation/ExpanderFunction_Tests.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ namespace Microsoft.Build.Engine.UnitTests.Evaluation
1414
{
1515
public class ExpanderFunction_Tests
1616
{
17-
private readonly ITestOutputHelper _output;
18-
19-
public ExpanderFunction_Tests(ITestOutputHelper output) => _output = output;
20-
2117
/* Tests for TryConvertToInt */
2218

2319
[Fact]

‎src/Build.UnitTests/Utilities_Tests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,9 @@ namespace Microsoft.Build.UnitTests
2121
{
2222
public class UtilitiesTestStandard : UtilitiesTest
2323
{
24-
private readonly ITestOutputHelper _output;
25-
26-
public UtilitiesTestStandard(ITestOutputHelper output)
24+
public UtilitiesTestStandard()
2725
{
2826
this.loadAsReadOnly = false;
29-
_output = output;
3027
}
3128

3229
[Fact]

‎src/Framework.UnitTests/ProjectStartedEventArgs_Tests.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,12 @@ namespace Microsoft.Build.UnitTests
1616
/// </summary>
1717
public class ProjectStartedEventArgs_Tests
1818
{
19-
/// <summary>
20-
/// Default event to use in tests.
21-
/// </summary>
22-
private static ProjectStartedEventArgs s_baseProjectStartedEvent;
23-
2419
/// <summary>
2520
/// Setup for text fixture, this is run ONCE for the entire test fixture
2621
/// </summary>
2722
public ProjectStartedEventArgs_Tests()
2823
{
2924
BuildEventContext parentBuildEventContext = new BuildEventContext(2, 3, 4, 5);
30-
s_baseProjectStartedEvent = new ProjectStartedEventArgs(1, "Message", "HelpKeyword", "ProjecFile", "TargetNames", null, null, parentBuildEventContext);
3125
}
3226

3327
/// <summary>

0 commit comments

Comments
 (0)