Skip to content

Commit 26a43cd

Browse files
dougbudougbu
authored
Merge branch 'master' into merge/release/3.0-preview5-to-master
2 parents 5502cf4 + 19c9010 commit 26a43cd

File tree

537 files changed

+5813
-191157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

537 files changed

+5813
-191157
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ jobs:
297297
agentOs: Windows
298298
isTestingJob: true
299299
buildScript: ./eng/scripts/cibuild.cmd
300-
buildArgs: -test "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true /p:RunTemplateTests=false"
300+
buildArgs: -test "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true /p:RunTemplateTests=false /p:BuildSiteExtensions=false"
301301
beforeBuild:
302302
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
303303
displayName: Setup IISExpress test certificates and schema
@@ -318,7 +318,7 @@ jobs:
318318
agentOs: Windows
319319
isTestingJob: true
320320
buildScript: ./src/ProjectTemplates/build.cmd
321-
buildArgs: -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true"
321+
buildArgs: -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /p:BuildSiteExtensions=false"
322322
beforeBuild:
323323
- powershell: ./eng/scripts/cibuild.cmd
324324
displayName: Build Repo

‎.azure/pipelines/signalr-daily-tests.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,7 @@ jobs:
1414
agentOs: Windows
1515
jobName: SignalRDailyTests
1616
jobDisplayName: "SignalR Daily Tests"
17-
17+
artifacts:
18+
- name: Windows_Logs
19+
path: ../../artifacts/logs/
20+
publishOnError: true

‎Directory.Build.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
<!-- Suppress KoreBuild warnings about the mismatch of repo version and local project version. The versioning in this mega repo is sufficiently complicated that KoreBuild's validation isn't helpful. -->
7272
<VerifyVersion>false</VerifyVersion>
7373

74-
<EnableApiCheck Condition=" '$(EnableApiCheck)' != '' ">$(IsImplementationProject)</EnableApiCheck>
7574
<IsPackable Condition="'$(IsPackable)' == '' AND ('$(IsImplementationProject)' == 'true' OR '$(IsAnalyzersProject)' == 'true') ">true</IsPackable>
7675
<IsPackable Condition="'$(IsPackable)' == '' ">false</IsPackable>
7776

‎NuGet.config

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
<clear />
55
<!--
66
Restore sources should be defined in build/sources.props.
7-
The only allowed feed here is myget.org/aspnet-tools which is required to work around
7+
The only allowed feed here is dotnet-core which is required to work around
88
https://github.com/Microsoft/msbuild/issues/2914
99
-->
1010
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
11-
<add key="myget.org aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
12-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
1311
</packageSources>
1412
</configuration>

‎THIRD-PARTY-NOTICES.txt

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,72 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
9595
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
9696

9797
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
98+
99+
License notice for MessagePack-CSharp
100+
-------------------------------------
101+
102+
MessagePack for C#
103+
104+
MIT License
105+
106+
Copyright (c) 2017 Yoshifumi Kawai
107+
108+
Permission is hereby granted, free of charge, to any person obtaining a copy
109+
of this software and associated documentation files (the "Software"), to deal
110+
in the Software without restriction, including without limitation the rights
111+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
112+
copies of the Software, and to permit persons to whom the Software is
113+
furnished to do so, subject to the following conditions:
114+
115+
The above copyright notice and this permission notice shall be included in all
116+
copies or substantial portions of the Software.
117+
118+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
119+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
120+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
121+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
122+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
123+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
124+
SOFTWARE.
125+
126+
---
127+
128+
lz4net
129+
130+
Copyright (c) 2013-2017, Milosz Krajewski
131+
132+
All rights reserved.
133+
134+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
135+
136+
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
137+
138+
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
139+
140+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
141+
142+
143+
License notice for Nerdbank.Streams
144+
-----------------------------------
145+
146+
The MIT License (MIT)
147+
148+
Copyright (c) Andrew Arnott
149+
150+
Permission is hereby granted, free of charge, to any person obtaining a copy
151+
of this software and associated documentation files (the "Software"), to deal
152+
in the Software without restriction, including without limitation the rights
153+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
154+
copies of the Software, and to permit persons to whom the Software is
155+
furnished to do so, subject to the following conditions:
156+
157+
The above copyright notice and this permission notice shall be included in all
158+
copies or substantial portions of the Software.
159+
160+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
161+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
162+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
163+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
164+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
165+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
166+
SOFTWARE.

‎build/repo.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<DisableDefaultTargets>true</DisableDefaultTargets>
99
<DisableDefaultItems>true</DisableDefaultItems>
1010
<BuildSolutions>false</BuildSolutions>
11-
<BuildSiteExtensions Condition="'$(TargetRuntimeIdentifier)' == 'win-x64' OR '$(TargetRuntimeIdentifier)' == 'win-x86'">true</BuildSiteExtensions>
11+
<BuildSiteExtensions Condition="('$(TargetRuntimeIdentifier)' == 'win-x64' OR '$(TargetRuntimeIdentifier)' == 'win-x86') AND '$(BuildSiteExtensions)' == ''">true</BuildSiteExtensions>
1212

1313
<OverridePackageOutputPath>false</OverridePackageOutputPath>
1414

‎build/sources.props

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,23 @@
1414
https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json;
1515
https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json;
1616
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
17+
https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev;
1718
https://api.nuget.org/v3/index.json;
18-
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
19-
https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json;
19+
</RestoreSources>
20+
<!-- TODO remove this once we remove usages of Internal.AspNetCore.Sdk. -->
21+
<RestoreSources>
22+
$(RestoreSources);
2023
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
21-
https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
22-
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
23-
https://dotnet.myget.org/F/nuget-build/api/v3/index.json;
24+
</RestoreSources>
25+
<!-- TODO remove this once we move Microsoft.Internal.AspNetCore.H2Spec.All to a non-myget feed -->
26+
<RestoreSources>
27+
$(RestoreSources);
28+
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
29+
</RestoreSources>
30+
<!-- Only used to fetch Microsoft.NETFramework.ReferenceAssemblies for x-plat netfx builds. -->
31+
<RestoreSources Condition=" '$(OS)' != 'Windows_NT' ">
32+
$(RestoreSources);
2433
https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
25-
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
26-
https://vside.myget.org/F/devcore/api/v3/index.json;
27-
https://vside.myget.org/F/vsmac/api/v3/index.json;
28-
https://vside.myget.org/F/vssdk/api/v3/index.json;
2934
</RestoreSources>
3035

3136
<!-- In an orchestrated build, this may be overriden to other Azure feeds. -->

‎eng/Dependencies.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ and are generated based on the last package release.
4242
<LatestPackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
4343
<LatestPackageReference Include="Microsoft.Azure.KeyVault" Version="$(MicrosoftAzureKeyVaultPackageVersion)" />
4444
<LatestPackageReference Include="Microsoft.Azure.Storage.Blob" Version="$(MicrosoftAzureStorageBlobPackageVersion)" />
45-
<LatestPackageReference Include="Microsoft.Bcl.Json.Sources" Version="$(MicrosoftBclJsonSourcesPackageVersion)" />
4645
<LatestPackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
4746
<LatestPackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
4847
<LatestPackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisCommonPackageVersion)" />
@@ -99,6 +98,7 @@ and are generated based on the last package release.
9998
<LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
10099
<LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
101100
<LatestPackageReference Include="Microsoft.Extensions.Logging.EventSource" Version="$(MicrosoftExtensionsLoggingEventSourcePackageVersion)" />
101+
<LatestPackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="$(MicrosoftExtensionsLoggingEventLogPackageVersion)" />
102102
<LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
103103
<LatestPackageReference Include="Microsoft.Extensions.Logging.TraceSource" Version="$(MicrosoftExtensionsLoggingTraceSourcePackageVersion)" />
104104
<LatestPackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
@@ -157,9 +157,9 @@ and are generated based on the last package release.
157157
<LatestPackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
158158
<LatestPackageReference Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerPackageVersion)" />
159159
<LatestPackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
160+
<LatestPackageReference Include="System.Text.Json" Version="$(SystemTextJsonPackageVersion)" />
160161
<LatestPackageReference Include="System.Threading.Channels" Version="$(SystemThreadingChannelsPackageVersion)" />
161162
<LatestPackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsPackageVersion)" />
162-
<LatestPackageReference Include="Utf8Json" Version="$(Utf8JsonPackageVersion)" />
163163
<LatestPackageReference Include="xunit.abstractions" Version="$(XunitAbstractionsPackageVersion)" />
164164
<LatestPackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" />
165165
<LatestPackageReference Include="xunit.assert" Version="$(XunitAssertPackageVersion)" />

‎eng/SharedFramework.External.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
4141
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
4242
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging.EventSource" Version="$(MicrosoftExtensionsLoggingEventSourcePackageVersion)" />
43+
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging.EventLog" Version="$(MicrosoftExtensionsLoggingEventLogPackageVersion)" />
4344
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging.TraceSource" Version="$(MicrosoftExtensionsLoggingTraceSourcePackageVersion)" />
4445
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
4546
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
@@ -70,6 +71,7 @@
7071
-->
7172
<_TransitiveExternalAspNetCoreAppReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" />
7273
<_TransitiveExternalAspNetCoreAppReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
74+
<_TransitiveExternalAspNetCoreAppReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
7375
</ItemGroup>
7476

7577
<ItemGroup Condition=" '$(IsServicingBuild)' == 'true' ">
@@ -89,6 +91,7 @@
8991
<_CompilationOnlyReference Include="System.Buffers" />
9092
<_CompilationOnlyReference Include="System.ComponentModel.Annotations" />
9193
<_CompilationOnlyReference Include="System.Runtime.CompilerServices.Unsafe" />
94+
<_CompilationOnlyReference Include="System.Text.Json" />
9295
</ItemGroup>
9396

9497
<!--

0 commit comments

Comments
 (0)