diff --git a/Configuration.props b/Configuration.props index 50c66232889..39fbe2b7149 100644 --- a/Configuration.props +++ b/Configuration.props @@ -17,6 +17,7 @@ Condition="Exists('$(MSBuildThisFileDirectory)Configuration.Override.props')" /> + true <_StandardLibraryPath Condition=" '$(TargetFrameworkVersion)' == '' ">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPathToStandardLibraries('.NETFramework', 'v4.7.2', '')) v4.7.2 diff --git a/Directory.Build.props b/Directory.Build.props index 9a4a134146e..a3e29cb5747 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,7 @@ + true 9.0 net$(DotNetTargetFrameworkVersion) $(DotNetTargetFramework)-android diff --git a/build-tools/automation/yaml-templates/install-microbuild-tooling.yaml b/build-tools/automation/yaml-templates/install-microbuild-tooling.yaml index a57dd9561a1..54fc4e6d6a0 100644 --- a/build-tools/automation/yaml-templates/install-microbuild-tooling.yaml +++ b/build-tools/automation/yaml-templates/install-microbuild-tooling.yaml @@ -11,7 +11,7 @@ steps: - task: UsePythonVersion@0 inputs: - versionSpec: 3.11.x + versionSpec: 3.11 # ESRP signing requires minimum azure client version 2.8.0 - template: azure-tools/az-client-update.yml@yaml-templates diff --git a/build-tools/scripts/RunTests.targets b/build-tools/scripts/RunTests.targets index 5445dab3a85..1542b584483 100644 --- a/build-tools/scripts/RunTests.targets +++ b/build-tools/scripts/RunTests.targets @@ -1,10 +1,10 @@ - + <_TopDir>$(MSBuildThisFileDirectory)..\.. - + diff --git a/build-tools/xaprepare/xaprepare/Application/Context.cs b/build-tools/xaprepare/xaprepare/Application/Context.cs index 811c0294a3d..97b948a6f1e 100644 --- a/build-tools/xaprepare/xaprepare/Application/Context.cs +++ b/build-tools/xaprepare/xaprepare/Application/Context.cs @@ -605,7 +605,8 @@ string GetLogDirectory () void WriteBuildToolsInventoryCsv () { - var inventoryFilePath = Path.Combine (Path.GetDirectoryName (MainLogFilePath), "buildtoolsinventory.csv"); + var mainLogFileDirectory = Path.GetDirectoryName (MainLogFilePath) ?? throw new ArgumentException ("Could not get directory for MainLogFilePath"); + var inventoryFilePath = Path.Combine (mainLogFileDirectory, "buildtoolsinventory.csv"); var lines = new List { "BuildToolName,BuildToolVersion", }; diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index 2ed0adfb120..2767f8fb376 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -119,7 +119,7 @@ async Task DownloadDotNetArchive (Context context, string archiveDestinati (bool success, ulong size, HttpStatusCode status) = await Utilities.GetDownloadSizeWithStatus (archiveUrl); if (!success) { if (status == HttpStatusCode.NotFound) { - Log.WarningLine ($"dotnet archive URL {archiveUrl} not found"); + Log.InfoLine ($"dotnet archive URL {archiveUrl} not found"); return false; } else { Log.WarningLine ($"Failed to obtain dotnet archive size. HTTP status code: {status} ({(int)status})"); diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_ThirdPartyNotices.cs b/build-tools/xaprepare/xaprepare/Steps/Step_ThirdPartyNotices.cs index 1aa1c2cad04..6b28b261528 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_ThirdPartyNotices.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_ThirdPartyNotices.cs @@ -172,7 +172,7 @@ void ProcessTPN (SortedDictionary licenses, ThirdPart Log.StatusLine ($" {Context.Instance.Characters.Bullet} Processing: ", tpn.Name, ConsoleColor.Gray, ConsoleColor.White); if (licenses.ContainsKey (tpn.Name)) { - Log.WarningLine ($"Duplicate Third Party Notice '{tpn.Name}' (old class: {licenses [tpn.Name]}; new class: {tpn})"); + Log.InfoLine ($"Duplicate Third Party Notice '{tpn.Name}' (old class: {licenses [tpn.Name]}; new class: {tpn})"); return; } diff --git a/tests/api-compatibility/api-compatibility.targets b/tests/api-compatibility/api-compatibility.targets index 22a05eff7ae..1c2881fd3dc 100644 --- a/tests/api-compatibility/api-compatibility.targets +++ b/tests/api-compatibility/api-compatibility.targets @@ -1,6 +1,6 @@ - +