Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Update Branding to 3.1.8 #42962

Merged
merged 8 commits into from
Aug 12, 2020
Merged

Update Branding to 3.1.8 #42962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0192aeb
Merge in 'release/3.1' changes
dotnet-bot Jun 25, 2020
2266222
Merge in 'release/3.1' changes
dotnet-bot Jun 25, 2020
a914fc0
Merge in 'release/3.1' changes
dotnet-bot Jul 14, 2020
fdd1401
Update dependencies from https://github.com/dotnet/coreclr build 2020…
dotnet-bot Jul 15, 2020
3592b73
Merge in 'release/3.1' changes
dotnet-bot Jul 16, 2020
f447a7c
Update dependencies from https://github.com/dotnet/coreclr build 2020…
dotnet-bot Jul 16, 2020
36b8b8e
Merged PR 9103: [internal/release/3.1] Update dependencies from dncen…
dotnet-bot Jul 20, 2020
c43db29
update branding
Anipik Aug 11, 2020
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
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.4-servicing.20315.1">
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.4-servicing.20366.2">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WHy are these stuck at 3.1.4?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i fixed these in dotnet/coreclr#28075
I was missing the place where we update the transport packages

<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>20ee1c47c2bcec0101e3cf04c98549aeffe85989</Sha>
<Sha>e8b17841cb5ce923aec48a1b0c12042d445d508f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.4-servicing.20315.1">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.4-servicing.20366.2">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>20ee1c47c2bcec0101e3cf04c98549aeffe85989</Sha>
<Sha>e8b17841cb5ce923aec48a1b0c12042d445d508f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.4-servicing.20315.1">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.4-servicing.20366.2">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>20ee1c47c2bcec0101e3cf04c98549aeffe85989</Sha>
<Sha>e8b17841cb5ce923aec48a1b0c12042d445d508f</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<!-- The .NET Core product branding version -->
<ProductVersion>3.1.7</ProductVersion>
<ProductVersion>3.1.8</ProductVersion>
<!-- We need to move to 4.7 as part of our versioning change when we switch to arcade to avoid downgrading versions -->
<MajorVersion>4</MajorVersion>
<MinorVersion>7</MinorVersion>
Expand Down Expand Up @@ -51,9 +51,9 @@
<MicrosoftNETCoreDotNetHostPackageVersion>3.1.0-preview3.19553.2</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.1.0-preview3.19553.2</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<!-- Coreclr dependencies -->
<MicrosoftNETSdkILPackageVersion>3.1.4-servicing.20315.1</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>3.1.4-servicing.20315.1</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.4-servicing.20315.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETSdkILPackageVersion>3.1.4-servicing.20366.2</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>3.1.4-servicing.20366.2</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.4-servicing.20366.2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<!-- Corefx dependencies -->
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19409.15</MicrosoftNETCorePlatformsPackageVersion>
<runtimenativeSystemIOPortsPackageVersion>4.6.0-preview9.19409.15</runtimenativeSystemIOPortsPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.20213.4",
"Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.20213.4",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "3.1.4-servicing.20315.1"
"Microsoft.NET.Sdk.IL": "3.1.4-servicing.20366.2"
}
}
12 changes: 0 additions & 12 deletions src/packages.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,6 @@
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<!-- add specific builds / pkgproj's here to include in servicing builds -->
<Project Include="$(MSBuildThisFileDirectory)Microsoft.IO.Redist\pkg\Microsoft.IO.Redist.pkgproj">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.builds">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<Project Include="$(MSBuildThisFileDirectory)System.Data.SqlClient\pkg\System.Data.SqlClient.pkgproj">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Windows.Compatibility\Microsoft.Windows.Compatibility.builds">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
</ItemGroup>

<ItemGroup>
Expand Down