Skip to content

Merge release/dev17.8 to release/dev17.10 #73954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 45 commits into from
Jun 14, 2024
Merged

Merge release/dev17.8 to release/dev17.10 #73954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
baf5ebb
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] May 9, 2024
5de0846
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] May 20, 2024
5ae86fd
Fix compiler warnings
Cosifne May 20, 2024
327a53a
update version for system.data.sqlclient (#73845)
akhera99 Jun 5, 2024
0b97669
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 5, 2024
1276451
Backport test fixes from #70248
JoeRobich Jun 5, 2024
5e7daff
Backport pragma disable from #70248
JoeRobich Jun 5, 2024
e7ebb8a
Pass Refs as ref
JoeRobich Jun 5, 2024
7efe8d8
Backport XUnit.targets change from #68573
JoeRobich Jun 5, 2024
d0fc8b7
Revert "Pass Refs as ref"
JoeRobich Jun 6, 2024
544f07f
Backport removing xunit.assert from #68573
JoeRobich Jun 6, 2024
3333f90
Disable a warning.
JoeRobich Jun 6, 2024
8f8e3d1
Revert "Disable a warning."
JoeRobich Jun 6, 2024
995239d
Restore newline
JoeRobich Jun 6, 2024
de68f73
Move to a newer SDK
JoeRobich Jun 6, 2024
119a8d4
Fix sdk version
JoeRobich Jun 6, 2024
8644b2c
Use a more recent VS
JoeRobich Jun 6, 2024
91a5a0f
Revert to the SDK used in Arcade and update VS version
JoeRobich Jun 6, 2024
01c7636
Go back to the .NET 8p7 SDK which predates the ref readonly changes m…
JoeRobich Jun 6, 2024
f435dbb
Revert "Backport test fixes from #70428"
JoeRobich Jun 7, 2024
b9076bb
Require VS 17.6 for build
JoeRobich Jun 7, 2024
1c9c747
Backport test fixes from #68212
JoeRobich Jun 7, 2024
555c13e
Suppress a warning
jjonescz Oct 5, 2023
10476ae
Merge pull request #73409 from dotnet/darc-release/dev17.8-5c782976-c…
Cosifne Jun 10, 2024
bbdbfdd
Update MicrosoftDevDivOptimizationDataPowerShellVersion to 1.0.803 (#…
akhera99 Jun 10, 2024
a254870
Merge remote-tracking branch 'origin/release/dev17.6' into darc-relea…
JoeRobich Jun 10, 2024
7cdcef3
Skip failing test.
JoeRobich Jun 11, 2024
30c81a5
Backport RestoreSource from #73532
JoeRobich Jun 11, 2024
c867f07
Merge branch 'release/dev17.8' into merges/release/dev17.6-to-release…
JoeRobich Jun 11, 2024
1e89ac2
Update required VS to 17.8.
JoeRobich Jun 11, 2024
7d05c55
Merge pull request #73929 from dotnet/merges/release/dev17.6-to-relea…
dotnet-bot Jun 12, 2024
7dce3e2
Merge pull request #73951 from dotnet/dev/jorobich/fix-17.8-official-…
JoeRobich Jun 12, 2024
2f686f5
update version (#73950)
akhera99 Jun 12, 2024
be2743f
Merge branch 'release/dev17.6' into darc-release/dev17.6-f1969d28-bf0…
JoeRobich Jun 12, 2024
e58065d
Merge pull request #73864 from dotnet/darc-release/dev17.6-f1969d28-b…
JoeRobich Jun 12, 2024
c95a0ed
Merge branch 'release/dev17.8' into merges/release/dev17.6-to-release…
JoeRobich Jun 12, 2024
fbce284
Move builds to 1ES PT
JoeRobich Jun 12, 2024
63a620c
Merge pull request #73953 from dotnet/merges/release/dev17.6-to-relea…
dotnet-bot Jun 12, 2024
ac1154a
Upgrade MicrosoftCodeAnalysisTestingVersion to 1.1.2-beta1.24121.1 (#…
akhera99 Jun 13, 2024
553f618
Merge pull request #73973 from dotnet/dev/jorobich/17.6-1espt
JoeRobich Jun 13, 2024
9645d13
Update version for system.data.sqlclient to 4.8.6 (#73975)
akhera99 Jun 13, 2024
074c7c1
Merge branch 'release/dev17.6' into release/dev17.8
jjonescz Jun 13, 2024
014f916
Merge pull request #73978 from dotnet/merges/release/dev17.6-to-relea…
dotnet-bot Jun 13, 2024
adcf614
Merge branch 'release/dev17.8' into release/dev17.10
jjonescz Jun 13, 2024
23904fd
Remove test skip.
JoeRobich Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions eng/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,21 @@
<PackageVersion Include="Microsoft.Build" Version="17.3.4" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.3.4" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.3.4" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.3.4" />
</ItemGroup>

<ItemGroup Condition="'$(DotnetBuildFromSource)' != 'true' and '$(TargetFramework)' != 'net472'">
<PackageVersion Include="Microsoft.Build" Version="17.7.2" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.7.2" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.7.2" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.7.2" />
</ItemGroup>

<ItemGroup Condition="'$(DotnetBuildFromSource)' != 'true' and '$(TargetFramework)' == 'net472'">
<PackageVersion Include="Microsoft.Build" Version="17.10.4" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.10.4" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.10.4" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.10.4" />
</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 9 additions & 4 deletions eng/InternalTools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@
https://devdiv.pkgs.visualstudio.com/_packaging/Engineering/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
</RestoreSources>
<RestoreSources>
$(RestoreSources);
https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json
</RestoreSources>
</PropertyGroup>

<ItemGroup>
<!-- Add explicit Newtonsoft.Json dependency to override the implicit 10.0.1 version brought in by Microsoft.DevDiv.Optimization.Data.PowerShell -->
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'" />
<PackageReference Include="Microsoft.DevDiv.Optimization.Data.PowerShell" Version="$(MicrosoftDevDivOptimizationDataPowerShellVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
<ItemGroup Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
<!-- Add explicit top-level dependencies to override the implicit versions brought in by Microsoft.DevDiv.Optimization.Data.PowerShell -->
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)"/>
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)"/>
<PackageReference Include="Microsoft.DevDiv.Optimization.Data.PowerShell" Version="$(MicrosoftDevDivOptimizationDataPowerShellVersion)" ExcludeAssets="all"/>
</ItemGroup>

</Project>
5 changes: 5 additions & 0 deletions src/Tools/BuildBoss/BuildBoss.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="WindowsBase" />
<PackageReference Include="Microsoft.Build" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Tasks.Core" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Locator" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="System.Reflection.Metadata" />
Expand Down
3 changes: 3 additions & 0 deletions src/Tools/BuildBoss/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Microsoft.Build.Locator;
using Mono.Options;

namespace BuildBoss
Expand All @@ -30,6 +31,8 @@ internal static int Main(string[] args)

private static bool MainCore(string[] args)
{
VisualStudioInstance instance = MSBuildLocator.RegisterDefaults();
Console.WriteLine($"Version: {instance.Version}");
string repositoryDirectory = null;
string configuration = "Debug";
string primarySolution = null;
Expand Down
1 change: 1 addition & 0 deletions ...kspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<PackageReference Include="Microsoft.Build" VersionOverride="17.3.4" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Framework" VersionOverride="17.3.4" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.Build.Tasks.Core" VersionOverride="17.3.4" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="17.3.4" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Locator" PrivateAssets="All" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="System.CommandLine" />
Expand Down