Skip to content

Commit

Permalink
Merge pull request #12508 from dotnet/dev/merge-internal-07152020/rel…
Browse files Browse the repository at this point in the history
…ease/3.1.1xx

Merge internal changes and update branding to 3.1.107
  • Loading branch information
wtgodbe authored Jul 16, 2020
2 parents 96de863 + 1345aee commit 43e6617
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="3.1.5">
<Dependency Name="Microsoft.NET.HostModel" Version="3.1.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>65cd7897774a464b5991c1962f7a0d476bb63101</Sha>
<Sha>3acd9b0cd16596bad450c82be08780875a73c05c</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="5.4.0-rtm.6292">
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>
<!-- Repo Version Information -->
<PropertyGroup>
<VersionPrefix>3.1.106</VersionPrefix>
<VersionPrefix>3.1.107</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
</PropertyGroup>
<!-- Production Dependencies -->
Expand All @@ -15,7 +15,7 @@
<MicrosoftBuildFrameworkVersion>15.4.8</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>15.4.8</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftExtensionsDependencyModelVersion>2.1.0-preview2-26306-03</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETHostModelVersion>3.1.5</MicrosoftNETHostModelVersion>
<MicrosoftNETHostModelVersion>3.1.6</MicrosoftNETHostModelVersion>
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
<NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
<NuGetBuildTasksPackageVersion>5.4.0-rtm.6292</NuGetBuildTasksPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "3.1.105",
"dotnet": "3.1.106",
"vs-opt": {
"version": "15.9"
}
Expand Down

0 comments on commit 43e6617

Please sign in to comment.