Skip to content

Merge blazor-wasm -> 3.1 #21921

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.

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

Merged
merged 355 commits into from
Jun 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
355 commits
Select commit Hold shift + click to select a range
074f8fa
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Feb 13, 2020
fb50111
No-op if ValidateComplexType is validated without the right context (…
pranavkm Feb 13, 2020
75ca750
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Feb 14, 2020
52f4636
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Feb 14, 2020
04b4602
PWA template (#18878)
SteveSandersonMS Feb 14, 2020
8fb412e
allow valid error message to be displayed on linux (#18997)
tamingchaos Feb 14, 2020
e0fe30c
Remove ProjectTemplates ownership (#19066)
ryanbrandenburg Feb 14, 2020
4628dfb
Cache assemblies and wasm using content hashes (#18859)
SteveSandersonMS Feb 17, 2020
0dbb01b
[Blazor] Adds an authentication library for Blazor webassembly (#18851)
javiercn Feb 17, 2020
07098b3
[Blazor][Wasm] Template changes to support auth in Blazor wasm (#18933)
javiercn Feb 18, 2020
c935e9a
Blazor WebAssembly package renames (#19026)
pranavkm Feb 18, 2020
e521205
Rename Blazor.Mono -> Components.WebAssembly.Runtime
pranavkm Feb 18, 2020
31f63d9
Add a perf scenario involing nested components + editing
pranavkm Jan 31, 2020
92409e2
Make the dev-server log less (#18971)
pranavkm Feb 13, 2020
d90f5ef
Update WASM Runtime
pranavkm Feb 18, 2020
52c4598
Fixup
pranavkm Feb 18, 2020
0e155fd
[Fixes #12588][Blazor] Move Blazor to use Static Web Assets (#18409)
javiercn Feb 19, 2020
38f3267
Fix token in PWA manifest
SteveSandersonMS Feb 19, 2020
1dfbe75
Rename Blazor.Mono -> Components.WebAssembly.Runtime (#19124)
pranavkm Feb 19, 2020
ffc7279
Use RTM version of the SDK (#19130)
pranavkm Feb 19, 2020
6342a81
Update launchSettings.json for BlazorWASM (#19136)
mkArtakMSFT Feb 19, 2020
2f6938e
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Feb 19, 2020
09ee6a7
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Feb 19, 2020
c39bc6a
[Blazor] Move to MapBlazorWebAssemblyApplication (#19147)
javiercn Feb 20, 2020
e9ccd7f
Only the PWA template should produce ServiceWorkerAssetsManifest
SteveSandersonMS Feb 20, 2020
6a85855
[Blazor][Wasm] Move HttpClient from default services to Program.Main …
Regenhardt Feb 20, 2020
06def5c
Workaround CacheStorage API bug
SteveSandersonMS Feb 20, 2020
c5f5325
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Feb 20, 2020
9ded8e1
Change MapBlazorWebAssemblyApplication to UseBlazorFrameworkFiles (#1…
javiercn Feb 21, 2020
4715de4
Fixup RuntimeDependenciesResolver test (#19208)
pranavkm Feb 21, 2020
0541e19
[Blazor][Wasm] Adds support for AAD and AADB2C using msal.js (#19190)
javiercn Feb 21, 2020
c9c06f5
[Blazor] Adds support for statically pre-compressing assets using gzi…
javiercn Feb 21, 2020
6fe946e
Blazor WebAssembly caching fixes (#19235)
SteveSandersonMS Feb 21, 2020
7ba8d06
BlazorWASM: API review (#19219)
pranavkm Feb 21, 2020
e8d2d56
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Feb 21, 2020
9c16db3
Add service provider factory support
rynowak Feb 8, 2020
226f461
[Blazor] Remove compression middleware from the template (#19285)
javiercn Feb 24, 2020
461051e
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Feb 24, 2020
bfcf72d
Fix boot json on mac/linux (#19332)
SteveSandersonMS Feb 25, 2020
34b165a
Update Mono debug proxy (#19335)
SteveSandersonMS Feb 25, 2020
20a5d7a
Include `inspectUri` in the launch profiles (#19308)
mkArtakMSFT Feb 25, 2020
d8ff274
Target the Razor SDK in Driver app (#19344)
pranavkm Feb 25, 2020
74cd830
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Feb 25, 2020
190e323
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Feb 26, 2020
f3633f3
Remove unused DevToolsClient.cs source file (#19364)
SteveSandersonMS Feb 26, 2020
a52e708
[Blazor] Add instructions to configure the authority when it is missing
javiercn Feb 26, 2020
b2d01f8
[Blazor] Fix error handling in AuthorizeService.ts
javiercn Feb 26, 2020
90d7d0b
Include favicon in service worker cache
SteveSandersonMS Feb 26, 2020
d9ed516
Cache authentication configuration in IndividualLocalAuth && Hosted case
SteveSandersonMS Feb 26, 2020
4319bbf
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Feb 26, 2020
eed3605
In debug mode, don't enable the linker by default (plus other minor b…
SteveSandersonMS Feb 27, 2020
2b72b63
[Blazor][Wasm] Add missing state callbacks (#19405)
javiercn Feb 27, 2020
252576d
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Feb 28, 2020
0216ca2
Stop service worker interfering with Identity UI (#19400)
SteveSandersonMS Feb 28, 2020
555cf52
Initialize the runtime state correctly for debugging (#19426)
pranavkm Feb 28, 2020
b65cec0
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Feb 29, 2020
573a8a8
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Mar 2, 2020
20f9180
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 2, 2020
f9dc9c3
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 2, 2020
085f6e1
[Blazor][Fixes #19503] Exclude gzip files from manifest (#19525)
javiercn Mar 3, 2020
fee14d8
Update debug proxy to match Mono commit b91580bafa7208b4a52d66cfadce0…
SteveSandersonMS Mar 3, 2020
601d58b
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 3, 2020
f34b8b7
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 3, 2020
12238a9
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 3, 2020
4c8a174
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 3, 2020
98cd3ab
Allow loading dlls with arbitrary extensions
SteveSandersonMS Mar 4, 2020
54a6399
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 4, 2020
e15e1c2
[Blazor] Fix incrementalism with unlinked files (#19596)
javiercn Mar 5, 2020
f4446f3
Use browser APIs to calculate Blazor's download size (#19547)
pranavkm Mar 5, 2020
e5cd390
Update ws-proxy to match Mono commit 4c348d6567f42be (#19600)
Mar 5, 2020
28c44ce
[Blazor] API cleanups for the authentication Package (#19601)
Mar 5, 2020
63e8089
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 5, 2020
a4cca73
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 5, 2020
b02978e
React to dotnet.js having a version number (#19603)
pranavkm Mar 5, 2020
e40fc36
Update debug proxy to match https://github.com/mono/mono/commit/59735…
pranavkm Mar 5, 2020
247c0dd
Make BlazorLinkerDescriptor public (#19649)
pranavkm Mar 6, 2020
d73925a
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 6, 2020
9f49048
Remove inspectUri launch setting (#19672)
mkArtakMSFT Mar 7, 2020
112e3f1
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 7, 2020
59a92c8
[blazor-wasm] Update hosted and BYOC agents used in our builds
dougbu Mar 7, 2020
ce58840
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 8, 2020
adc81c9
[Blazor] Fix default value for response type (#19706)
javiercn Mar 9, 2020
37a05ba
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 9, 2020
810a9fa
Update SurveyPrompt.razor (#19712)
danroth27 Mar 9, 2020
4e48bef
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 9, 2020
4741da1
Allow BlazorWasm benchmark driver to perform stress runs (#19619)
pranavkm Mar 9, 2020
6833fac
Use TargetPath in blazor dev server (#19658)
pranavkm Mar 10, 2020
a0c76e5
Rename WebAssembly.JSInterop -> Microsoft.JSInterop.WebAssembly
pranavkm Mar 10, 2020
064f156
Remove WebAssembly.JSInterop
pranavkm Mar 10, 2020
58bbbb7
Rename WebAssembly.JSInterop -> Microsoft.JSInterop.WebAssembly (#19747)
pranavkm Mar 10, 2020
70f8666
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 10, 2020
df97e3a
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 11, 2020
72d1a91
Update Blazor versions to preview3 (#19771)
pranavkm Mar 11, 2020
a1faa16
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 11, 2020
297d497
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 11, 2020
823082d
Clean up feeds (#19798)
pranavkm Mar 12, 2020
0006fdf
Revert "Remove inspectUri launch setting (#19672)" (#19786)
mkArtakMSFT Mar 12, 2020
147c392
Add support for configuration (#19544)
pranavkm Mar 12, 2020
2e9bb2f
Debug proxy as external tool (#19767)
SteveSandersonMS Mar 12, 2020
343816f
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 12, 2020
9343d2b
Log unhandled exceptions to custom logger (#19606)
SteveSandersonMS Mar 13, 2020
f1b812e
Update ws-proxy code (#19826)
SteveSandersonMS Mar 13, 2020
614ac8e
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 13, 2020
9078b35
[blazor-wasm] Ensure PDBArtifacts artifact is created (#19837)
dougbu Mar 14, 2020
f64fcc0
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 14, 2020
e2b574c
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 15, 2020
0582767
Fix Blazor icon for PWAs on iOS (#19897)
captainsafia Mar 16, 2020
c37f3fe
Turn on scope validation for service provider
pranavkm Mar 16, 2020
49bf3bb
Resolve issues in Blazor PWA template (#19898)
captainsafia Mar 16, 2020
cb29366
Make extensions
pranavkm Mar 17, 2020
56d22a8
Turn on scope validation for service provider in Development (#19908)
pranavkm Mar 17, 2020
a700aa9
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 18, 2020
dbe6302
Restore public API contract on WebAssemblyJSRuntime (#19968)
SteveSandersonMS Mar 19, 2020
4339397
Shrink icon-512.png (#19999)
SteveSandersonMS Mar 19, 2020
c7d3c1f
Use custom DebugProxyHost to initialize DebugProxy config (#19980)
captainsafia Mar 19, 2020
4b36083
Spruce up WebAssemblyHostEnvironment interface and use (#20008)
captainsafia Mar 20, 2020
ba2bae8
Load .dlls/.wasm/.pdb in parallel with dotnet.*.js. Fixes #18898 (#20…
SteveSandersonMS Mar 20, 2020
e6078c4
Add BaseAddress property to WebAssemblyHostEnvironment (#20019)
captainsafia Mar 23, 2020
163d90b
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 24, 2020
6fad3d3
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 24, 2020
3ba4cbf
Update NuGet.config (#19801)
pranavkm Mar 24, 2020
47536a3
Blazor wasm preview4 (#20117)
pranavkm Mar 25, 2020
383a4eb
Revert "Blazor wasm preview4 (#20117)"
pranavkm Mar 25, 2020
7e62656
Merge remote-tracking branch 'origin/blazor-wasm-preview4' into blazo…
pranavkm Mar 25, 2020
4ab628f
Merge pull request #20129 from dotnet/prkrishn/fixup-merge
pranavkm Mar 25, 2020
9f9783c
Tweaks for WASM stress runs (#20109)
pranavkm Mar 25, 2020
b9d7772
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 25, 2020
bbe9cca
Write hash to service worker on publish (#20131)
SteveSandersonMS Mar 25, 2020
de2fa4c
Update versions
pranavkm Mar 25, 2020
263cf0b
Skip flaky test
pranavkm Mar 25, 2020
c93389f
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 25, 2020
3e07040
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 26, 2020
b0a95d0
[Blazor] Auth fixes (#20191)
javiercn Mar 26, 2020
cb6858f
Update to using System.Net.Http.Json (#20195)
pranavkm Mar 26, 2020
82d05ae
Add support for loading satellite assemblies (#20033)
pranavkm Mar 26, 2020
45eb039
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 26, 2020
35d7da8
Update dependencies from https://github.com/dotnet/corefx build 20200…
dotnet-maestro[bot] Mar 27, 2020
18a196b
Update dependencies from https://github.com/dotnet/corefx build 20200…
dotnet-maestro[bot] Mar 27, 2020
c379bae
Fix SWAM hash (#20240)
SteveSandersonMS Mar 28, 2020
56b944f
Fix missing pdbs in Blazor build (#20257)
pranavkm Mar 28, 2020
07b12fe
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 28, 2020
78534e5
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Mar 29, 2020
248b31e
Load satellite resources before rendering components
pranavkm Mar 29, 2020
fa2db44
Update WebAssemblyHost.cs
pranavkm Mar 30, 2020
df1252a
Load satellite resources before rendering root components (#20299)
pranavkm Mar 30, 2020
cba5387
Bring back logic to remove unwanted env variables (#20326)
captainsafia Mar 30, 2020
87539a8
Removed the `useWebAssemblyDebugging` flag (#20325)
mkArtakMSFT Mar 30, 2020
c877f88
Add error page to hosted server project. Fixes #19670
SteveSandersonMS Mar 31, 2020
05ee136
Rename site.css to app.css. Fixes #19779
SteveSandersonMS Mar 31, 2020
aeff119
Blazor dev server: serve all files (#20355)
SteveSandersonMS Mar 31, 2020
5285c5e
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Apr 1, 2020
a8bd551
Set crossorigin to anonymous for integrity attribute (#20348)
MarkusRodler Apr 1, 2020
ae569e2
Add some extra publish integration tests, plus fix publish-from-VS-wi…
SteveSandersonMS Apr 1, 2020
dd2f0c9
Remove the use of toJavaScriptString (#20260)
pranavkm Apr 2, 2020
113cb54
Support JsonStringEnumConverter. Fixes #19086 (#20446)
SteveSandersonMS Apr 2, 2020
a949421
Preserve files being published to the publish root and the wwwroot
pranavkm Mar 17, 2020
0c614ff
Fixup
pranavkm Mar 18, 2020
a7c2d25
Remove constraints on WebAssembly.Build package
pranavkm Mar 25, 2020
861e88c
Fixup tests
pranavkm Mar 25, 2020
a127eb8
Fixup
pranavkm Mar 25, 2020
1b2cb0b
Apply suggestions from code review
pranavkm Apr 2, 2020
b906b10
Preserve files being published to the publish root and the wwwroot (#…
pranavkm Apr 2, 2020
41a9588
Move specifying default Blazor linker config to props file (#20458)
pranavkm Apr 3, 2020
e67e7a0
Remove WebAssemblyLoggerFactory and refactor logging setup (#20432)
captainsafia Apr 3, 2020
fd9c786
[Blazor] More auth fixes (#20192)
javiercn Apr 4, 2020
8232c6a
[Fixes #19644][Blazor] Support brotli compression for framework files…
javiercn Apr 6, 2020
351eba7
Cleanup Blazor standalone publish output (#20470)
pranavkm Apr 6, 2020
c2afc70
Enable doc comments generation (#20564)
mkArtakMSFT Apr 6, 2020
96e70eb
[blazor-wasm] Update dependencies from dotnet/blazor dotnet/arcade (#…
dotnet-maestro[bot] Apr 6, 2020
3224092
Update ws-proxy sources to match Mono commit c5149e31b4d7c (#20579)
SteveSandersonMS Apr 6, 2020
f34ef73
[Blazor][Wasm] Auth cleanups (#20587)
javiercn Apr 6, 2020
93eec70
Added `aspnet-blazor-eng` as a code-owner for the `src/Components` (#…
mkArtakMSFT Apr 7, 2020
43bd9db
[Blazor][Wasm] API review feedback (#20652)
javiercn Apr 8, 2020
c4703ac
Enable reading and editing from same Configuration object (#20647)
captainsafia Apr 10, 2020
294c2cf
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Apr 10, 2020
4a2b5a5
Update dependencies from https://github.com/dotnet/corefx build 20200…
dotnet-maestro[bot] Apr 10, 2020
cc04078
Merge branch 'blazor-wasm' into blazor-wasm-preview5
pranavkm Apr 11, 2020
546b520
[Blazor][Wasm] Adds HttpMessageHandler to automatically attach tokens…
javiercn Apr 13, 2020
0dda642
Update to preview5 (#20723)
pranavkm Apr 13, 2020
17b4bc2
Merge pull request #20749 from dotnet/blazor-wasm-preview5
pranavkm Apr 13, 2020
0599068
Unconditionally enable razor pages in hosted template. Fixes #20791 (…
SteveSandersonMS Apr 13, 2020
1e70883
Create a ref-assembly package for HttpHandler (#20382)
pranavkm Apr 13, 2020
38285eb
Pin shared fx version to 3.1.0 (#20802)
pranavkm Apr 14, 2020
b289633
Do not override existing web.config during IIS publish
captainsafia Apr 8, 2020
f3a1fb6
Fixups
pranavkm Apr 13, 2020
9dda113
Make Ignitor tests flaky
pranavkm Apr 14, 2020
468af97
Update Blazor WebAssembly survey link for 3.2.0-preview5
danroth27 Apr 13, 2020
3fbb2f0
Add timezone support (#20493)
pranavkm Apr 14, 2020
fc38f9e
[blazor-wasm] Update dependencies from dotnet/arcade dotnet/blazor (#…
dotnet-maestro[bot] Apr 14, 2020
d03c3b2
Move auth config options to app settings (#20790)
captainsafia Apr 14, 2020
87050c9
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Apr 15, 2020
4c312e1
Fix weather.json (#20769)
ar0311 Apr 15, 2020
ad72586
[Blazor][Wasm] Build fixes for incrementalism and PWA (#20861)
javiercn Apr 15, 2020
b2c88e9
Add Microsoft.Extensions.Logging namespace to template (#20869)
captainsafia Apr 15, 2020
840d806
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Apr 16, 2020
50a2527
Copy I18N assemblies when running without the linker (#20878)
pranavkm Apr 16, 2020
80bc4c4
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Apr 17, 2020
353641b
Update dependencies from https://github.com/dotnet/corefx build 20200…
dotnet-maestro[bot] Apr 17, 2020
fcb96b6
Upgrade all NPM dependencies. Update to use current Emscripten APIs m…
SteveSandersonMS Apr 16, 2020
e95264f
Support overriding how boot resources are loaded. Fixes #5462
SteveSandersonMS Apr 16, 2020
03068c9
Transfer .NET unhandled exceptions to JS via dedicated interop call. …
SteveSandersonMS Apr 17, 2020
8f12519
Fix typo in ServiceWorkerAssetsManifest.targets (#20944)
javiercn Apr 17, 2020
ad5b64f
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Apr 17, 2020
d2ee131
Fixup reference to M.AspNetCore.Components.WebAssembly.HttpHandler (#…
pranavkm Apr 17, 2020
790ac27
Update to rc1 branding (#20954)
pranavkm Apr 17, 2020
afeadef
Update dependencies from https://github.com/dotnet/corefx build 20200…
dotnet-maestro[bot] Apr 17, 2020
f393c74
Update Blazor WebAssembly survey link for 3.2.0-rc1 (#20974)
danroth27 Apr 17, 2020
089bb4a
Improve tests for logging configuration support (#20973)
captainsafia Apr 18, 2020
2bd662f
Update DbgProxy to c8cbcaad (#20865)
pranavkm Apr 20, 2020
202d214
Avoid copying timezone data bytes (#21028)
pranavkm Apr 20, 2020
6c23730
Compute SHA256s for blazor.boot.json in parallel (#21021)
pranavkm Apr 21, 2020
2612ec8
Updating build to https://github.com/mono/mono/commit/ae8e4b5b044 (#2…
pranavkm Apr 21, 2020
b8f7dde
[blazor-wasm] Update dependencies from dotnet/arcade dotnet/blazor (#…
dotnet-maestro[bot] Apr 21, 2020
25f89e2
Update dbgproxy to https://github.com/mono/mono/commit/70ff920a896c0d…
pranavkm Apr 21, 2020
98bbb3b
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Apr 21, 2020
5dc5f6c
Silence the runtime output from the debugger (#20975)
lewing Apr 22, 2020
df332c2
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Apr 22, 2020
7cb9b7f
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Apr 23, 2020
5da3146
Add an option to allow trimming collation data
pranavkm Apr 22, 2020
40f0cdf
Fix up template generation for config (#21147)
captainsafia Apr 23, 2020
3f31c8d
Update dependencies from https://github.com/dotnet/corefx build 20200…
dotnet-maestro[bot] Apr 24, 2020
7fd744e
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Apr 27, 2020
a3bbe2f
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Apr 27, 2020
b837ebf
Produce RTM branded blazor packages (#21257)
pranavkm Apr 27, 2020
b67a903
Update dependencies from https://github.com/dotnet/corefx build 20200…
dotnet-maestro[bot] Apr 27, 2020
9cb92db
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] Apr 29, 2020
4438f33
Update ws-proxy to match runtime in use (from Mono commit cc6d4bf6cfc…
SteveSandersonMS Apr 30, 2020
147f575
Ensure satellite resources are published when building in VS (#21347)
pranavkm Apr 30, 2020
2a97de0
Fix intermediate path for service worker assets (#21128)
captainsafia Apr 30, 2020
22d4dcd
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] May 4, 2020
cc2b64e
Re-use the Blazor app for stress runs (#21078)
pranavkm May 4, 2020
9e412f4
Do not attempt to load satellite assemblies until after MainAsync has…
pranavkm May 5, 2020
4f5bf16
Show debugger attach message (#21483)
pranavkm May 5, 2020
4e7665a
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] May 5, 2020
2ca2a2d
Update debugger to https://github.com/mono/mono/commit/1a6e64a9381c61…
pranavkm May 6, 2020
e07b939
Update dependencies from https://github.com/dotnet/blazor build 20200…
dotnet-maestro[bot] May 11, 2020
22522a0
Update to mono sources http://github.com/mono/mono/commit/57dcba253 (…
pranavkm May 11, 2020
158126c
Add a scenario with timers (#19626)
pranavkm May 11, 2020
8966415
Merge commit 'bbafecc0535e1de3264845e51ea8b3d18eb3ca61' into prkrishn…
pranavkm May 15, 2020
bb0f54f
Merge commit '96db48550802b5db8f32bdc05ed0b805a9e66ef7' into prkrishn…
pranavkm May 15, 2020
8efeefb
Merge branch 'blazor-wasm' into prkrishn/merge-blazor-wasm
pranavkm May 15, 2020
9949ab4
Fixup JS (#21922)
pranavkm May 18, 2020
ae2017f
Changes to allow building in 3.1 branch
pranavkm May 18, 2020
8100720
Quality of life improvements
pranavkm May 27, 2020
53edc76
Listen to the internet
pranavkm May 27, 2020
0394a45
Fix logging config and output redirection in DebugProxy (#22157)
captainsafia May 26, 2020
11ac23c
Changes per PR
pranavkm Jun 9, 2020
dd62a69
Merge remote-tracking branch 'origin/release/3.1' into prkrishn/merge…
pranavkm Jun 9, 2020
ae8f67f
Use randomized ports in dotnet-serve
pranavkm Jun 10, 2020
b3ad812
Mark Wasm benchmark app as a test asset
pranavkm Jun 10, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .azure/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,8 @@ stages:
vmImage: 'ubuntu-16.04'
variables:
DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet
# This isn't needed in the path because build does not need to _use_ global tools.
DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true
steps:
- script: |
Expand Down
7 changes: 7 additions & 0 deletions .azure/pipelines/jobs/default-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ jobs:
- _BuildConfig: ${{ parameters.configuration }}
- BuildConfiguration: ${{ parameters.configuration }}
- BuildDirectory: ${{ parameters.buildDirectory }}
- DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
- TeamName: AspNetCore
- ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
Expand Down Expand Up @@ -155,6 +156,12 @@ jobs:
- ${{ if and(eq(parameters.installTar, 'true'), eq(parameters.agentOs, 'Windows')) }}:
- powershell: ./eng/scripts/InstallTar.ps1
displayName: Find or install Tar
- ${{ if eq(parameters.agentOs, 'Windows') }}:
- powershell: Write-Host "##vso[task.prependpath]$(DOTNET_CLI_HOME)\.dotnet\tools"
displayName: Add dotnet tools to path
- ${{ if ne(parameters.agentOs, 'Windows') }}:
- script: echo "##vso[task.prependpath]$(DOTNET_CLI_HOME)/.dotnet/tools"
displayName: Add dotnet tools to path

- ${{ parameters.beforeBuild }}

Expand Down
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-serve": {
"version": "1.7.125",
"commands": [
"dotnet-serve"
]
}
}
}
50 changes: 50 additions & 0 deletions eng/Baseline.Designer.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-sql-cache' ">
<BaselinePackageVersion>3.1.5</BaselinePackageVersion>
</PropertyGroup>
<!-- Package: Microsoft.Authentication.WebAssembly.Msal-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' ">
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' AND '$(TargetFramework)' == 'netstandard2.1' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="[3.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.ApiAuthorization.IdentityServer-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApiAuthorization.IdentityServer' ">
<BaselinePackageVersion>3.1.5</BaselinePackageVersion>
Expand Down Expand Up @@ -201,6 +208,49 @@
<BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.5, )" />
<BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.5, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' ">
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' AND '$(TargetFramework)' == 'netstandard2.1' ">
<BaselinePackageReference Include="Microsoft.JSInterop.WebAssembly" Version="[3.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="[3.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.3, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[3.1.3, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.3, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Build-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Build' ">
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Build' AND '$(TargetFramework)' == 'any' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" Version="[3.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Server-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Server' ">
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Server' AND '$(TargetFramework)' == 'netcoreapp3.1' " />
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Authentication-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' ">
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' AND '$(TargetFramework)' == 'netstandard2.1' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="[3.1.3, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.3, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly.HttpHandler-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.HttpHandler' ">
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.HttpHandler' AND '$(TargetFramework)' == 'netstandard2.1' " />
<!-- Package: Microsoft.JSInterop.WebAssembly-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' ">
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' AND '$(TargetFramework)' == 'netstandard2.1' ">
<BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.3, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.ConcurrencyLimiter-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ConcurrencyLimiter' ">
<BaselinePackageVersion>3.1.5</BaselinePackageVersion>
Expand Down
7 changes: 7 additions & 0 deletions eng/Baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Update this list when preparing for a new patch.
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
<Package Id="dotnet-sql-cache" Version="3.1.5" />
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.0" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.5" />
Expand All @@ -30,6 +31,12 @@ Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.0" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.0" />
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.0" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.5" />
Expand Down
3 changes: 2 additions & 1 deletion eng/Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
$(RepoRoot)src\Installers\**\*.*proj;
$(RepoRoot)src\SignalR\clients\ts\**\node_modules\**\*.*proj;
$(RepoRoot)src\Components\Web.JS\node_modules\**\*.*proj;
$(RepoRoot)src\Components\Blazor\Templates\src\content\**\*.*proj;
$(RepoRoot)src\Components\WebAssembly\Build\testassets\**\*.csproj;
$(RepoRoot)src\ProjectTemplates\ComponentsWebAssembly.ProjectTemplates\content\**\*.csproj;
$(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.csproj;
$(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.fsproj;
$(RepoRoot)src\ProjectTemplates\Web.Spa.ProjectTemplates\content\**\*.csproj;
Expand Down
3 changes: 2 additions & 1 deletion eng/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ and are generated based on the last package release.
<LatestPackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
<LatestPackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
<LatestPackageReference Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" />
<LatestPackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonPackageVersion)" />
<LatestPackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" />
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
<LatestPackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngPackageVersion)" />
Expand Down Expand Up @@ -122,7 +123,7 @@ and are generated based on the last package release.
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.1" Version="$(MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.2" Version="$(MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="$(MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.Blazor.Mono" Version="$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" Version="$(MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion)" />
<LatestPackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalPackageVersion)" />
Expand Down
12 changes: 7 additions & 5 deletions eng/ProjectReferences.props
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,14 @@
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" ProjectPath="$(RepoRoot)src\SignalR\common\Protocols.NewtonsoftJson\src\Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Specification.Tests" ProjectPath="$(RepoRoot)src\SignalR\server\Specification.Tests\src\Microsoft.AspNetCore.SignalR.Specification.Tests.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" ProjectPath="$(RepoRoot)src\SignalR\server\StackExchangeRedis\src\Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor" ProjectPath="$(RepoRoot)src\Components\Blazor\Blazor\src\Microsoft.AspNetCore.Blazor.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Build" ProjectPath="$(RepoRoot)src\Components\Blazor\Build\src\Microsoft.AspNetCore.Blazor.Build.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.HttpClient" ProjectPath="$(RepoRoot)src\Components\Blazor\Http\src\Microsoft.AspNetCore.Blazor.HttpClient.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Server" ProjectPath="$(RepoRoot)src\Components\Blazor\Server\src\Microsoft.AspNetCore.Blazor.Server.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.DataAnnotations.Validation" ProjectPath="$(RepoRoot)src\Components\Blazor\Validation\src\Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj" />
<ProjectReferenceProvider Include="Ignitor" ProjectPath="$(RepoRoot)src\Components\Ignitor\src\Ignitor.csproj" />
<ProjectReferenceProvider Include="Microsoft.Authentication.WebAssembly.Msal" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Authentication.Msal\src\Microsoft.Authentication.WebAssembly.Msal.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Build" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Build\src\Microsoft.AspNetCore.Components.WebAssembly.Build.csproj" />
<ProjectReferenceProvider Include="blazor-brotli" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Compression\src\Microsoft.AspNetCore.Components.WebAssembly.Build.BrotliCompression.csproj" />
<ProjectReferenceProvider Include="Microsoft.JSInterop.WebAssembly" ProjectPath="$(RepoRoot)src\Components\WebAssembly\JSInterop\src\Microsoft.JSInterop.WebAssembly.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Server" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Server\src\Microsoft.AspNetCore.Components.WebAssembly.Server.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssembly.Authentication\src\Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssembly\src\Microsoft.AspNetCore.Components.WebAssembly.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" RefProjectPath="$(RepoRoot)src\DefaultBuilder\ref\Microsoft.AspNetCore.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.Abstractions" ProjectPath="$(RepoRoot)src\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" RefProjectPath="$(RepoRoot)src\DataProtection\Abstractions\ref\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Cryptography.Internal" ProjectPath="$(RepoRoot)src\DataProtection\Cryptography.Internal\src\Microsoft.AspNetCore.Cryptography.Internal.csproj" RefProjectPath="$(RepoRoot)src\DataProtection\Cryptography.Internal\ref\Microsoft.AspNetCore.Cryptography.Internal.csproj" />
Expand Down
10 changes: 7 additions & 3 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="3.1.0-preview4.19605.1" Pinned="true">
<Uri>https://github.com/aspnet/Blazor</Uri>
<Sha>7868699de745fd30a654c798a99dc541b77b95c0</Sha>
<Dependency Name="Microsoft.AspNetCore.Components.WebAssembly.Runtime" Version="3.2.0">
<Uri>https://github.com/dotnet/blazor</Uri>
<Sha>cc449601d638ffaab58ae9487f0fd010bb178a12</Sha>
</Dependency>
<Dependency Name="System.Net.Http.Json" Version="3.2.0">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>66409e392d64ed96e5d3a5fda712d9baf51196ed</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.1.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri>
Expand Down
12 changes: 8 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>6</AspNetCorePatchVersion>
<PreReleasePreviewNumber>0</PreReleasePreviewNumber>

<ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
<ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>
<ComponentsWebAssemblyPatchVersion>1</ComponentsWebAssemblyPatchVersion>

<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
Expand All @@ -19,9 +24,6 @@
<IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
<!-- Blazor Client packages will not RTM with 3.1 -->
<BlazorClientPreReleasePreviewNumber>4</BlazorClientPreReleasePreviewNumber>
<BlazorClientPreReleaseVersionLabel>preview$(BlazorClientPreReleasePreviewNumber)</BlazorClientPreReleaseVersionLabel>
<AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>
<!-- The following property may need to be updated if ingesting new versions of Extensions.Refs package. The package override version is used to create PackageOverrides.txt in the targeting pack. -->
<MicrosoftInternalExtensionsRefsPackageOverrideVersion>3.1.0</MicrosoftInternalExtensionsRefsPackageOverrideVersion>
Expand All @@ -30,6 +32,7 @@
<!-- Servicing builds have different characteristics for the way dependencies, framework references, and versions are handled. -->
<IsServicingBuild Condition=" '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
<VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
<ComponentsWebAssemblyVersionPrefix>$(ComponentsWebAssemblyMajorVersion).$(ComponentsWebAssemblyMinorVersion).$(ComponentsWebAssemblyPatchVersion)</ComponentsWebAssemblyVersionPrefix>
<!-- TargetingPackVersionPrefix is used by projects, like .deb and .rpm, which use slightly different version formats. -->
<TargetingPackVersionPrefix>$(VersionPrefix)</TargetingPackVersionPrefix>
<!-- Targeting packs do not produce patch versions in servicing builds. No API changes are allowed in patches. -->
Expand Down Expand Up @@ -92,12 +95,13 @@
<SystemServiceProcessServiceControllerPackageVersion>4.7.0</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>4.7.1</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
<SystemNetHttpJsonPackageVersion>3.2.0</SystemNetHttpJsonPackageVersion>
<SystemThreadingChannelsPackageVersion>4.7.1</SystemThreadingChannelsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.7.0</SystemWindowsExtensionsPackageVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsPackageVersion>3.1.1</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from aspnet/Blazor -->
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.1.0-preview4.19605.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>3.2.0</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>
<!-- Packages from aspnet/Extensions -->
<InternalAspNetCoreAnalyzersPackageVersion>3.1.5-servicing.20270.9</InternalAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.5-servicing.20270.9</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/CodeCheck.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ try {
Get-ChildItem "$repoRoot/*.sln" -Recurse `
| ? {
# These .sln files are used by the templating engine.
($_.Name -ne "BlazorServerWeb_CSharp.sln")
(($_.Name -ne "BlazorServerWeb_CSharp.sln") -and ($_.Name -ne 'ComponentsWebAssembly-CSharp.sln'))
} `
| % {
Write-Host " Checking $(Split-Path -Leaf $_)"
Expand Down
Loading