Skip to content

Commit 6997f78

Browse files
dseefelddseefeld
authored
Merge pull request #1702 from dseefeld/3.1.7
[release/3.1] Update to August 2020 3.1.107 release (3.1.7)
2 parents 514c3ee + b75b2d5 commit 6997f78

10 files changed

+76
-100
lines changed

‎.vsts.pipelines/jobs/ci-linux_bootstrap.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
set -ex
5151
df -h
5252
$(docker.run) $(docker.bst.map) $(docker.bst.work) $(imageName) bash -c '
53-
git clone --depth 1 https://github.com/dotnet/source-build-reference-packages'
53+
git clone --single-branch --branch release/3.1 --depth 1 https://github.com/dotnet/source-build-reference-packages'
5454
du -h $(rootDirectory) | sort -h | tail -n 50
5555
displayName: clone source-build-reference-packages
5656
condition: always()

‎ProdConFeed.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://pkgs.dev.azure.com/dnceng/public/_packaging/3.1.103-servicing-014936/nuget/v3/index.json
1+
https://pkgs.dev.azure.com/dnceng/public/_packaging/3.1.103-servicing-014936/nuget/v3/index.json

‎build.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,12 @@ if [ "${internalPackageFeedPat:-}" ]; then
118118
# TODO: Read these from nuget.config
119119
# The internal transport isn't added by Darc, though, so it will still need special-casing.
120120
export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [
121-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-templating-3a2d6426/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
122-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-be18161f/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
123-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-3acd9b0c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
124-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-d63ec4a1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
125-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-62c098bc/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
121+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-templating-2cb6ddf0/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
122+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-784b0ffa/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
123+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-fcfdef8d-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
124+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-fcfdef8d/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
125+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-1c22292b/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
126+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-1bf292d4/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
126127
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
127128
]}'
128129
fi

‎eng/Version.Details.xml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,36 @@
2727
<Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
2828
<RepoName>linker</RepoName>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.4-servicing.20269.1" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
30+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.4-servicing.20366.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3131
<Uri>https://github.com/dotnet/coreclr</Uri>
32-
<Sha>018cfd06dceb19b6eb1e9217a500fb1071946fcd</Sha>
32+
<Sha>e8b17841cb5ce923aec48a1b0c12042d445d508f</Sha>
3333
<RepoName>coreclr</RepoName>
3434
<RepoName>coreclr-portable</RepoName>
3535
</Dependency>
3636
<Dependency Name="NETStandard.Library" Version="2.1.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
3737
<Uri>https://github.com/dotnet/standard</Uri>
3838
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20316.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
40+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20370.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
4141
<Uri>https://github.com/dotnet/corefx</Uri>
42-
<Sha>73aa947bfae18d576fc2fe69fb9c3f7839decd93</Sha>
42+
<Sha>36b8b8e26a8e2e06e000f59e19910d117bf0025b</Sha>
4343
<RepoName>corefx</RepoName>
4444
<RepoName>corefx-portable</RepoName>
4545
</Dependency>
46-
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
46+
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
4747
<Uri>https://github.com/dotnet/core-setup</Uri>
48-
<Sha>3acd9b0cd16596bad450c82be08780875a73c05c</Sha>
48+
<Sha>fcfdef8d6ba770e4d7ba9efefe2591d8c33a1fc6</Sha>
4949
<RepoName>core-setup</RepoName>
5050
<RepoName>core-setup-portable</RepoName>
5151
</Dependency>
52-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
52+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
5353
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
54-
<Sha>d63ec4a166a5c4f40fcbb823873cfa68cfd39eae</Sha>
54+
<Sha>1c22292bc7fca352074d8862cf39fbdb8647f208</Sha>
5555
<RepoName>aspnetcore-tooling</RepoName>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
57+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5858
<Uri>https://github.com/dotnet/templating</Uri>
59-
<Sha>3a2d6426513c7add0c1c140165d528c33e62bc21</Sha>
59+
<Sha>2cb6ddf076dd8bcfb4e480f357b770889e5fd55e</Sha>
6060
<RepoName>templating</RepoName>
6161
</Dependency>
6262
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.4.1-beta4-20127-10" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
@@ -72,14 +72,14 @@
7272
<Sha>6f8eb3a2e1db6b458451b9cfd2a4f5557769b041</Sha>
7373
<RepoName>nuget-client</RepoName>
7474
</Dependency>
75-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.6" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
75+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.7" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
7676
<Uri>https://github.com/dotnet/extensions</Uri>
77-
<Sha>be18161fbed286d6fb7a7b1c7999ce70a50cf3eb</Sha>
77+
<Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
7878
<RepoName>aspnet-extensions</RepoName>
7979
</Dependency>
80-
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.106-servicing.20316.13" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
80+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.107-servicing.20372.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
8181
<Uri>https://github.com/dotnet/sdk</Uri>
82-
<Sha>ff65e086ba67984e42a64123bcc6c310d0183fd4</Sha>
82+
<Sha>8eec7c319054da5800541f77fa6d1acb2a74c395</Sha>
8383
<RepoName>sdk</RepoName>
8484
</Dependency>
8585
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.DotNet.Cli.Runtime">
@@ -92,41 +92,41 @@
9292
<Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>
9393
<RepoName>application-insights</RepoName>
9494
</Dependency>
95-
<Dependency Name="XliffTasks" Version="1.0.0-beta.19252.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
95+
<Dependency Name="XliffTasks" Version="1.0.0-beta.19252.1">
9696
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
9797
<Sha>173ee3bd61c9549557eefa3cfb718bdef157cb87</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
99+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
100100
<Uri>https://github.com/dotnet/aspnetcore</Uri>
101-
<Sha>62c098bc170f50feca15916e81cb7f321ffc52ff</Sha>
101+
<Sha>1bf292d47ac2a0ebda07d8a3f00355dd01915ad5</Sha>
102102
<RepoName>aspnetcore</RepoName>
103103
</Dependency>
104-
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.106-servicing.20317.13" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
104+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.107-servicing.20372.17" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
105105
<Uri>https://github.com/dotnet/cli</Uri>
106-
<Sha>01244375eb89e6e3ea48123f7b6ec8193403a7ba</Sha>
106+
<Sha>bc693790b4064409950fe3306547063ec8107c26</Sha>
107107
<RepoName>cli</RepoName>
108108
</Dependency>
109109
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.7.0-beta.19610.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
110110
<Uri>https://github.com/dotnet/fsharp</Uri>
111111
<Sha>dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.106-servicing.20317.8" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
113+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.107-servicing.20372.9" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
114114
<Uri>https://github.com/dotnet/websdk</Uri>
115-
<Sha>9d9bfc40e20005ff3504d86a9b86bdcc447d94b2</Sha>
115+
<Sha>c08ab58519b7a51658011e550868f4b028600918</Sha>
116116
<RepoName>websdk</RepoName>
117117
</Dependency>
118118
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
119119
<Uri>https://github.com/microsoft/vstest</Uri>
120120
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.106-servicing.20317.31" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
122+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.107-servicing.20373.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
123123
<Uri>https://github.com/dotnet/toolset</Uri>
124-
<Sha>a7844b9e4a0db833265766e2af14dc7391371038</Sha>
124+
<Sha>7430c1266dce6ec378d3939ede2b925a1c509686</Sha>
125125
<RepoName>toolset</RepoName>
126126
</Dependency>
127-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20318.19">
127+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20373.14">
128128
<Uri>https://github.com/dotnet/installer</Uri>
129-
<Sha>0f94483edc7cae71ffc34a2c8e8f0a54534e331f</Sha>
129+
<Sha>617a3e03f4f24184a7ce83e08805ac84d0103127</Sha>
130130
<RepoName>core-sdk</RepoName>
131131
</Dependency>
132132
<!-- external dependencies, not handled by Maestro/Arcade -->

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<!-- Production Dependencies -->
99
<PropertyGroup>
1010
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20374.1</PrivateSourceBuildReferencePackagesPackageVersion>
11-
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.105.1</PrivateSourceBuiltArtifactsPackageVersion>
11+
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.106</PrivateSourceBuiltArtifactsPackageVersion>
1212
</PropertyGroup>
1313
</Project>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "3.1.102"
3+
"dotnet": "3.1.106"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",

‎patches/aspnetcore/0007-Fix-version-number.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
From 7b3fe9fe4db64383be08e2729edbf52f6fea604f Mon Sep 17 00:00:00 2001
2-
From: adaggarwal <aditya.aggarwal@microsoft.com>
3-
Date: Thu, 14 Nov 2019 17:27:30 +0000
1+
From b9a4b93b1f387486891e2fbd65f7789ac0844376 Mon Sep 17 00:00:00 2001
2+
From: dseefeld <dseefeld@microsoft.com>
3+
Date: Mon, 27 Jul 2020 19:29:54 +0000
44
Subject: [PATCH] Fix version number
55

66
This file is actually a very long minified JS file with a version number at the
77
end. The file is treated as binary, making this patch less clear, but it's easy
88
to update/reapply it with a text editor.
99
---
10-
.../Web.JS/dist/Release/blazor.server.js | Bin 216732 -> 216732 bytes
10+
.../Web.JS/dist/Release/blazor.server.js | Bin 216732 -> 216733 bytes
1111
1 file changed, 0 insertions(+), 0 deletions(-)
1212

1313
diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js
14-
index 5a7cfd0de00e1c2694bf333a972ec50943bb2c06..6bec823439b486c7bc2f0bdfaa58dd0fdbcb8797 100644
14+
index 5a7cfd0de00e1c2694bf333a972ec50943bb2c06..da374eea71824751541d58313f8a6e1b7af7bde7 100644
1515
GIT binary patch
16-
delta 22
17-
dcmbO;mv_!w-i8*&7N#xC)BM=Xlxkx&tpQ%N2TuS1
16+
delta 23
17+
ecmbO;mv`=5-i8*&7N#xC)BM=Ym1<)(t+@bZFb7-!
1818

1919
delta 22
20-
dcmbO;mv_!w-i8*&7N#xC)BM;>m1<)(tpQ%H2TlM0
20+
dcmbO`mv_!w-i8*&7N#xC)BM;>m1<)(tpQ%d2TuS1
2121

2222
--
23-
2.25.2
23+
1.8.3.1
2424

‎patches/core-setup/0009-remove-unneeded-feeds.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎repos/core-setup.common.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<BuildArguments Condition="$(Platform.Contains('arm')) AND '$(BuildArchitecture)' != 'arm64'">$(BuildArguments) /p:TargetArchitecture=$(Platform) /p:DisableCrossgen=true /p:CrossBuild=true</BuildArguments>
1919
<BuildArguments>$(BuildArguments) /p:BuildDebPackage=false</BuildArguments>
2020
<BuildArguments>$(BuildArguments) /p:BuildAllPackages=true</BuildArguments>
21+
<BuildArguments>$(BuildArguments) /p:AlwaysPackEvenIfNotServicing=true</BuildArguments>
2122
<BuildArguments>$(BuildArguments) /p:RestoreAllBuildRids=false</BuildArguments>
2223
<BuildArguments>$(BuildArguments) /p:OutputRid=$(OverrideTargetRid)</BuildArguments>
2324
<BuildArguments>$(BuildArguments) /p:DotNetOutputBlobFeedDir=$(SourceBuiltBlobFeedDir)</BuildArguments>

0 commit comments

Comments
 (0)