Skip to content

Commit ccff33e

Browse files
dseefelddseefeld
authored
Merge pull request #2046 from dseefeld/5.0.103
Update to 5.0.103
2 parents 3158f98 + 7ea5860 commit ccff33e

17 files changed

+151
-110
lines changed

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
66
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
77
</packageSources>
8+
<disabledPackageSources />
89
</configuration>

‎build.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,9 @@ if [ "${internalPackageFeedPat:-}" ]; then
108108
# TODO: Read these from nuget.config
109109
# The internal transport isn't added by Darc, though, so it will still need special-casing.
110110
export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [
111-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-cb5f173b/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
112-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-2670c128/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
113-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-installer-71365b4d/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
114-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/5.0.102-servicing.20614.17/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
111+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-c636bbdc/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
112+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-d827c653/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
113+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-installer-72dec52d/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
115114
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
116115
]}'
117116
fi

‎eng/SourceBuild.Tarball.TextOnlyPrebuilts.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@
2222
-->
2323
<ItemGroup>
2424
<TextOnlyPrebuiltNupkgFile Include="
25+
$(ProjectDir)packages\restored\**\microsoft.dotnet.web.itemtemplates.2.1.*.nupkg;
26+
$(ProjectDir)packages\restored\**\microsoft.dotnet.web.projecttemplates.2.1.2.1.*.nupkg;
27+
$(ProjectDir)packages\restored\**\microsoft.dotnet.web.spa.projecttemplates.2.1.2.1.*.nupkg;
28+
$(ProjectDir)packages\restored\**\microsoft.dotnet.common.itemtemplates.3.1.*.nupkg;
29+
$(ProjectDir)packages\restored\**\microsoft.dotnet.web.itemtemplates.3.1.*.nupkg;
30+
$(ProjectDir)packages\restored\**\microsoft.dotnet.web.projecttemplates.3.1.3.1.*.nupkg;
31+
$(ProjectDir)packages\restored\**\microsoft.dotnet.web.spa.projecttemplates.3.1.3.1.*.nupkg;
2532
$(ProjectDir)packages\restored\**\microsoft.dotnet.web.itemtemplates.5.0.*.nupkg;
2633
$(ProjectDir)packages\restored\**\microsoft.dotnet.web.projecttemplates.5.0.5.0.*.nupkg;
2734
$(ProjectDir)packages\restored\**\microsoft.dotnet.web.spa.projecttemplates.5.0.5.0.*.nupkg;

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
<Sha>25604250cf2663aed6630e305cc0538aeebda80a</Sha>
2828
<RepoName>linker</RepoName>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.2">
30+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
3131
<Uri>https://github.com/dotnet/runtime</Uri>
32-
<Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
32+
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
3333
<RepoName>runtime</RepoName>
3434
<RepoName>runtime-portable</RepoName>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
36+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
3737
<Uri>https://github.com/dotnet/templating</Uri>
38-
<Sha>568c09b99075179607c572f7b9f3ad3d706f1fc3</Sha>
38+
<Sha>5a9a6d5fd42c19379e3e65f41e1223a59ecc9930</Sha>
3939
</Dependency>
4040
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.20407.5">
4141
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -63,9 +63,9 @@
6363
<Sha>830c8be45dbbccd411ecf6080abff0c2c98079cf</Sha>
6464
<RepoName>nuget-client</RepoName>
6565
</Dependency>
66-
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.102-servicing.20613.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
66+
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.103-servicing.21073.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
6767
<Uri>https://github.com/dotnet/sdk</Uri>
68-
<Sha>ef14c79a16171496e2d972edd9a7874d596f624d</Sha>
68+
<Sha>0c81a4876c3f22f6753ae6fec6e74d1c20bc55f7</Sha>
6969
<RepoName>sdk</RepoName>
7070
</Dependency>
7171
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
@@ -83,9 +83,9 @@
8383
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
8484
<Sha>a52f3d7fb58470749ee4035fbbcb7e63c78b0459</Sha>
8585
</Dependency>
86-
<Dependency Name="dotnet-watch" Version="5.0.2-servicing.20613.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
86+
<Dependency Name="dotnet-watch" Version="5.0.3-servicing.21073.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
8787
<Uri>https://github.com/dotnet/aspnetcore</Uri>
88-
<Sha>2670c128d522473e146ff9f8159bfffdfe694cd9</Sha>
88+
<Sha>d827c653b787c07de908240b7746ce34d3e6271e</Sha>
8989
<RepoName>aspnetcore</RepoName>
9090
</Dependency>
9191
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20507.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
@@ -96,9 +96,9 @@
9696
<Uri>https://github.com/microsoft/vstest</Uri>
9797
<Sha>212656d7b384a506aa714999f678b3ace82d114e</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.102-servicing.20614.17">
99+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.103-servicing.21073.8">
100100
<Uri>https://github.com/dotnet/installer</Uri>
101-
<Sha>71365b4d424b0860ceb9ad8ee47f7cd08c55c362</Sha>
101+
<Sha>72dec52dbda7611ff3b2a39c96ef40942bedc4f0</Sha>
102102
<RepoName>installer</RepoName>
103103
</Dependency>
104104
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.20419.2">

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20623.1</PrivateSourceBuildReferencePackagesPackageVersion>
2626
</PropertyGroup>
2727
<PropertyGroup>
28-
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.100-920491-20201216</PrivateSourceBuiltArtifactsPackageVersion>
28+
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.102-952729-20210115.1</PrivateSourceBuiltArtifactsPackageVersion>
2929
</PropertyGroup>
3030
</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": "5.0.100"
3+
"dotnet": "5.0.102"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",

‎patches/aspnetcore/0004-Remove-Yarn-dependency-not-used-in-source-build.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ index 501ba161bf..ee9dcaf4fa 100644
3333
},
3434
"msbuild-sdks": {
3535
- "Yarn.MSBuild": "1.15.2",
36-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20580.4",
37-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20580.4"
36+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21063.3",
37+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21063.3"
3838
}
3939
diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
4040
index 939ba16f88..ea2c849ea3 100644

‎patches/aspnetcore/0007-Support-global.json-on-arm64-as-well.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ index ee9dcaf4fa..053e92ebee 100644
2424
+++ b/global.json
2525
@@ -5,13 +5,10 @@
2626
"tools": {
27-
"dotnet": "5.0.101",
27+
"dotnet": "5.0.102",
2828
"runtimes": {
2929
- "dotnet/x64": [
3030
+ "dotnet": [
31-
"2.1.23",
31+
"2.1.24",
3232
"$(MicrosoftNETCoreAppInternalPackageVersion)"
3333
],
3434
- "dotnet/x86": [
3535
- "$(MicrosoftNETCoreAppInternalPackageVersion)"
3636
- ],
3737
"aspnetcore/x64": [
38-
"3.1.10"
38+
"3.1.11"
3939
]
4040
--
4141
2.18.0

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From a4d1fdddfc3a171ba3858967c54ff0e2082f29b8 Mon Sep 17 00:00:00 2001
2+
From: dseefeld <[email protected]>
3+
Date: Thu, 17 Dec 2020 16:11:21 +0000
4+
Subject: [PATCH] Fix version number
5+
6+
This file is actually a very long minified JS file with a version number at the
7+
end. The file is treated as binary, making this patch less clear, but it's easy
8+
to update/reapply it with a text editor.
9+
---
10+
.../Web.JS/dist/Release/blazor.server.js | Bin 249682 -> 249682 bytes
11+
1 file changed, 0 insertions(+), 0 deletions(-)
12+
13+
diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js
14+
index 6fc91cb4c3d8816f2b4eed7a576e058bdfe57542..6ebe5b8226b821c16bb6c6f230922d7dc76c5e39 100644
15+
GIT binary patch
16+
delta 22
17+
dcmcaKkN?s<{)QID7N#xCKIhqtm1<)(tpRB#2lW5|
18+
19+
delta 22
20+
dcmcaKkN?s<{)QID7N#xCKIhpCm1<)(tpRBp2lD^`
21+
22+
--
23+
1.8.3.1
24+

‎patches/sdk/0018-Delete-assertions-invalid-with-servicing-SDK.patch

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

‎patches/sdk/0018-Ensure-WebSdk-projects-finish-before-PublishNetSdks.patch

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 4ba8044a223fb7ed001ce777c8112e231bcee7f8 Mon Sep 17 00:00:00 2001
2+
From: dseefeld <[email protected]>
3+
Date: Tue, 2 Feb 2021 09:18:31 -0500
4+
Subject: [PATCH] Ensure WebSdk projects finish before PublishNetSdks
5+
6+
---
7+
src/Layout/redist/targets/GenerateLayout.targets | 6 ++++++
8+
1 file changed, 6 insertions(+)
9+
10+
diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets
11+
index 48b0303..d45fda2 100644
12+
--- a/src/Layout/redist/targets/GenerateLayout.targets
13+
+++ b/src/Layout/redist/targets/GenerateLayout.targets
14+
@@ -70,6 +70,12 @@
15+
16+
<Target Name="PublishNetSdks"
17+
BeforeTargets="Build">
18+
+ <ItemGroup>
19+
+ <WebSdkProjectFile Include="$(RepoRoot)src\WebSdk\**\*.csproj" />
20+
+ </ItemGroup>
21+
+
22+
+ <MSBuild Projects="@(WebSdkProjectFile)" />
23+
+
24+
<PropertyGroup>
25+
<NETSdkSourceRoot>$(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk</NETSdkSourceRoot>
26+
<NETSdkWebSourceRoot>$(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk.Web</NETSdkWebSourceRoot>
27+
--
28+
1.8.3.1
29+

‎repos/Directory.Build.targets

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,10 @@
113113
<NuGetConfigFiles Include="$(NuGetConfigFile)" />
114114
</ItemGroup>
115115

116-
<RemoveInternetSourcesFromNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
117-
OfflineBuild="$(OfflineBuild)" />
116+
<RemoveInternetSourcesFromNuGetConfig
117+
NuGetConfigFile="%(NuGetConfigFiles.Identity)"
118+
OfflineBuild="$(OfflineBuild)"
119+
KeepFeedPrefixes="@(KeepFeedPrefixes)" />
118120

119121
<AddSourceToNuGetConfig NuGetConfigFile="%(NuGetConfigFiles.Identity)"
120122
SourceName="prebuilt"
@@ -140,6 +142,18 @@
140142
SourcePath="$(ExtraRestoreSourcePath)"
141143
Condition="'$(ExtraRestoreSourcePath)' != ''" />
142144

145+
<!--
146+
The internal transport feed is dynamically added by Arcade by a script called directly in the
147+
official pipeline, so in some cases we need to do the same here.
148+
-->
149+
<AddSourceToNuGetConfig
150+
Condition="
151+
'$(VSS_NUGET_EXTERNAL_FEED_ENDPOINTS)' != '' and
152+
'$(SetUpInternalTransportFeed)' == 'true'"
153+
NuGetConfigFile="%(NuGetConfigFiles.Identity)"
154+
SourceName="dotnet5-internal-transport"
155+
SourcePath="https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json" />
156+
143157
<!-- Update NuGet.Config files that have deprecated myget feeds -->
144158
<ItemGroup>
145159
<LegacyFeedMapping

‎repos/aspnetcore.proj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<Project>
2-
<PropertyGroup>
3-
<SourceDirectory>aspnetcore</SourceDirectory>
4-
</PropertyGroup>
52

63
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
74

‎repos/installer.proj

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<Project>
2-
<PropertyGroup>
3-
<SourceDirectory>installer</SourceDirectory>
4-
</PropertyGroup>
52

63
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
74

@@ -63,6 +60,9 @@
6360
<!-- This project builds zips, not NuGet packages. -->
6461
<SkipEnsurePackagesCreated>true</SkipEnsurePackagesCreated>
6562
<NuGetConfigFile>$(ProjectDirectory)/NuGet.config</NuGetConfigFile>
63+
64+
<!-- This repo uses text-only template packages from the internal transport feed. -->
65+
<SetUpInternalTransportFeed>true</SetUpInternalTransportFeed>
6666
</PropertyGroup>
6767

6868
<ItemGroup>
@@ -89,6 +89,15 @@
8989
<RepositoryReference Include="xliff-tasks" />
9090
</ItemGroup>
9191

92+
<!--
93+
If we have authentication, keep the templating internal feed (if one exists) to acquire the
94+
text-only prebuilt. The source-build repo as a whole should depend on the same internal feed as
95+
this repo does, so authentication should already be set up in the global endpoints json.
96+
-->
97+
<ItemGroup Condition="'$(VSS_NUGET_EXTERNAL_FEED_ENDPOINTS)' != ''">
98+
<KeepFeedPrefixes Include="darc-int-dotnet-aspnetcore-" />
99+
</ItemGroup>
100+
92101
<ItemGroup>
93102
<EnvironmentVariables Include="CLIBUILD_SKIP_TESTS=true" />
94103

‎repos/sdk.proj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<Project>
2-
<PropertyGroup>
3-
<SourceDirectory>sdk</SourceDirectory>
4-
</PropertyGroup>
52

63
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
74

0 commit comments

Comments
 (0)