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

Internal Code Merge and update branding to 5.0.3 #46888

Merged
merged 14 commits into from
Jan 14, 2021
Merged

Internal Code Merge and update branding to 5.0.3 #46888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
681e2c3
Set publishing to temporarily use internal/release-publishing branch
mmitche Dec 10, 2020
aeea2ad
Merge in 'release/5.0' changes
dotnet-bot Dec 10, 2020
56ff2f6
Merge in 'release/5.0' changes
dotnet-bot Dec 11, 2020
4f8dd29
Merge in 'release/5.0' changes
dotnet-bot Dec 11, 2020
728fdef
Merge in 'release/5.0' changes
dotnet-bot Dec 11, 2020
0260401
Merge in 'release/5.0' changes
dotnet-bot Dec 11, 2020
968afdf
Merge in 'release/5.0' changes
dotnet-bot Dec 11, 2020
2d2f618
Merge in 'release/5.0' changes
dotnet-bot Dec 11, 2020
db62a11
Merge in 'release/5.0' changes
dotnet-bot Dec 11, 2020
1cd455b
Merge in 'release/5.0' changes
dotnet-bot Dec 11, 2020
cb5f173
Merge in 'release/5.0' changes
dotnet-bot Dec 12, 2020
7d67ace
update branding to 5.0.3
Anipik Jan 12, 2021
f2d9d80
revert the branch name to master
Anipik Jan 13, 2021
18bc2c4
Fix Unix build issue (#42104)
davidwrighton Sep 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
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>
<PropertyGroup>
<!-- The .NET product branding version -->
<ProductVersion>5.0.2</ProductVersion>
<ProductVersion>5.0.3</ProductVersion>
<!-- File version numbers -->
<MajorVersion>5</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>2</PatchVersion>
<PatchVersion>3</PatchVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<!-- Set assembly version to align with major and minor version,
as for the patches and revisions should be manually updated per assembly if it is serviced. -->
Expand Down
4 changes: 3 additions & 1 deletion eng/native/build-commons.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,14 @@ EOF
export CXXFLAGS="${CXXFLAGS} ${EXTRA_CXXFLAGS}"
export LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}"

local exit_code
if [[ "$__StaticAnalyzer" == 1 ]]; then
pushd "$intermediatesDir"

buildTool="$SCAN_BUILD_COMMAND -o $__BinDir/scan-build-log $buildTool"
echo "Executing $buildTool install -j $__NumProc"
"$buildTool" install -j "$__NumProc"
exit_code="$?"

popd
else
Expand All @@ -185,13 +187,13 @@ EOF

echo "Executing $cmake_command --build \"$intermediatesDir\" --target install -- -j $__NumProc"
$cmake_command --build "$intermediatesDir" --target install -- -j "$__NumProc"
exit_code="$?"
fi

CFLAGS="${SAVED_CFLAGS}"
CXXFLAGS="${SAVED_CXXFLAGS}"
LDFLAGS="${SAVED_LDFLAGS}"

local exit_code="$?"
if [[ "$exit_code" != 0 ]]; then
echo "${__ErrMsgPrefix}Failed to build \"$message\"."
exit "$exit_code"
Expand Down
4 changes: 0 additions & 4 deletions src/libraries/libraries-packages.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<ProjectReference Include="$(PkgDir)*\*.proj" Exclude="$(PkgDir)test\*" Condition="'$(BuildAllOOBPackages)' == 'true'" />
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\**\*.pkgproj" Condition="('$(BuildAllConfigurations)' == 'true' or '$(DotNetBuildFromSource)' == 'true') And '$(BuildAllOOBPackages)' == 'true'" />
<!-- If setting BuildAllOOBPackages to false, add bellow the individual OOB packages you want to continue to build -->
<ProjectReference Include="$(LibrariesProjectRoot)\pkg\Microsoft.Windows.Compatibility\Microsoft.Windows.Compatibility.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
<ProjectReference Include="$(LibrariesProjectRoot)\System.Text.Json\pkg\System.Text.Json.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
<ProjectReference Include="$(LibrariesProjectRoot)\System.Diagnostics.DiagnosticSource\pkg\System.Diagnostics.DiagnosticSource.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
<ProjectReference Include="$(LibrariesProjectRoot)\System.Composition*\pkg\System.Composition*.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
</ItemGroup>

<!-- Need the PackageIndexFile file property from baseline.props -->
Expand Down
27 changes: 18 additions & 9 deletions src/libraries/pkg/baseline/packageIndex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,7 +1313,8 @@
"2.1.1",
"3.0.0",
"3.0.1",
"5.0.0"
"5.0.0",
"5.0.1"
],
"InboxOn": {}
},
Expand Down Expand Up @@ -2062,7 +2063,8 @@
"1.1.0",
"1.2.0",
"1.3.0",
"5.0.0"
"5.0.0",
"5.0.1"
],
"BaselineVersion": "5.0.0",
"InboxOn": {}
Expand All @@ -2073,7 +2075,8 @@
"1.1.0",
"1.2.0",
"1.3.0",
"5.0.0"
"5.0.0",
"5.0.1"
],
"BaselineVersion": "5.0.0",
"InboxOn": {},
Expand All @@ -2091,7 +2094,8 @@
"1.1.0",
"1.2.0",
"1.3.0",
"5.0.0"
"5.0.0",
"5.0.1"
],
"BaselineVersion": "5.0.0",
"InboxOn": {},
Expand All @@ -2109,7 +2113,8 @@
"1.1.0",
"1.2.0",
"1.3.0",
"5.0.0"
"5.0.0",
"5.0.1"
],
"BaselineVersion": "5.0.0",
"InboxOn": {},
Expand All @@ -2127,7 +2132,8 @@
"1.1.0",
"1.2.0",
"1.3.0",
"5.0.0"
"5.0.0",
"5.0.1"
],
"BaselineVersion": "5.0.0",
"InboxOn": {},
Expand All @@ -2145,7 +2151,8 @@
"1.1.0",
"1.2.0",
"1.3.0",
"5.0.0"
"5.0.0",
"5.0.1"
],
"BaselineVersion": "5.0.0",
"InboxOn": {},
Expand Down Expand Up @@ -2519,7 +2526,8 @@
"4.5.0",
"4.5.1",
"4.6.0",
"5.0.0"
"5.0.0",
"5.0.1"
],
"BaselineVersion": "5.0.0",
"InboxOn": {
Expand Down Expand Up @@ -6398,7 +6406,8 @@
"System.Text.Json": {
"StableVersions": [
"4.6.0",
"5.0.0"
"5.0.0",
"5.0.1"
],
"BaselineVersion": "5.0.0",
"InboxOn": {
Expand Down