Skip to content
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

Jump to bottom

Merge Internal/release/dev17.8 to release/dev17.8 #74335

Merged
merged 10 commits into from
Jul 12, 2024
Merged

Merge Internal/release/dev17.8 to release/dev17.8 #74335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
30bcfcb
Do not ship System.Text.Json with the MSBuild.BuildHost
JoeRobich May 7, 2024
8360067
Update BuildHost STJ to 8.0.4
tmat May 8, 2024
0efc837
Rever interactive host changes
tmat May 9, 2024
b0ca89e
Merged PR 39430: Do not ship System.Text.Json with the MSBuild.BuildHost
JoeRobich May 10, 2024
b6da442
add variable group and remove old one
mmitche May 13, 2024
8466672
Merged PR 39553: Port 39544 to 17.8
Cosifne May 13, 2024
a409e88
Updated Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
ericstj May 14, 2024
b66d98a
Merged PR 39560: Use Version instead of VersionOverride in Microsoft.…
ericstj May 14, 2024
4ad64b8
Remove internal feed
Cosifne Jul 10, 2024
09cdb3a
Extract version to Versions.props
Cosifne Jul 11, 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
2 changes: 1 addition & 1 deletion azure-pipelines-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ variables:
# To retrieve OptProf data we need to authenticate to the VS drop storage.
# Get access token with $dn-bot-devdiv-drop-rw-code-rw and dn-bot-dnceng-build-rw-code-rw from DotNet-VSTS-Infra-Access
# Get $AccessToken-dotnet-build-bot-public-repo from DotNet-Versions-Publish
- group: DotNet-Versions-Publish
- group: DotNet-VSTS-Infra-Access
- group: DotNet-DevDiv-Insertion-Workflow-Variables
- group: AzureDevOps-Artifact-Feeds-Pats
- name: _DevDivDropAccessToken
value: $(dn-bot-devdiv-drop-rw-code-rw)
- name: ArtifactServices.Drop.PAT
Expand Down
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@
<SystemTextEncodingExtensionsVersion>4.3.0</SystemTextEncodingExtensionsVersion>
<!-- Note: When updating SystemTextJsonVersion ensure that the version is no higher than what is used by MSBuild. -->
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
<SystemTextJsonFixedVersion>8.0.4</SystemTextJsonFixedVersion>
<SystemThreadingChannelsVersion>7.0.0</SystemThreadingChannelsVersion>
<SystemThreadingTasksDataflowVersion>7.0.0</SystemThreadingTasksDataflowVersion>
<!-- We need System.ValueTuple assembly version at least 4.0.3.0 on net47 to make F5 work against Dev15 - see https://github.com/dotnet/roslyn/issues/29705 -->
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -21,7 +21,7 @@
<PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion)" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(RefOnlyMicrosoftBuildTasksCoreVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" PrivateAssets="All" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonFixedVersion)" PrivateAssets="All" Condition="'$(DotnetBuildFromSource)' != 'true'"/>
<PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
Expand Down
Loading