Skip to content

Commit c5a0da5

Browse files
vnbaaijdvoituronMarvinKlein1508
authored
[Chore] Prepare for next release (#4273)
* Update NuGet package for fixing CVE. See dotnet/announcements#327 * Non-altering change to force mirroring * Clean up issue tester * Small text formatting change to force deploy * Update workflows * Update README * Update to latest JavaScript SDK * Add global.json * Update workflow to use .NET 9 * Remove net10.0 TFM for now * Set dotnet 9.0.204 * Update deploy_demo.yml to use 9.0.204 * Update home page * Also *temporarily* remove .NET 10 TFM for DataGrid Adapters * Update workflows * Try to get preview docs up again * Use latest .NET 9 SDK for GH Actions * Remove mention of v3 site * Update global.json * Test deploy to new SWA * Update JavaScript SDK * Try older JavaScript SDK * Use .204 SDK on all actions * Newer JavaScript SDK with .NET .204 SDK * Deploy demo to 2 SWAs * Fix id's * Evrything tied to .204 and add sub subscription * Get sources copied * Try again * Tweak message * Try again * Try again * Try swa.config.json * Try extension * Revert config.json change * Use correct codeql action * Include build step in actions * Set SDK for ADO pipelines * Add es metadata (#4131) * Merge pull request 53130 from invBootstrap into main * Update TSAOptions codebaseName (#4196) * Update TSAOptions codebaseName * Try to start the Mirroring * Update pipeline for real signing with PME enforcement * Add a trigger on main and a tag (v*) * Overwrite FocusAsync in FluentAutoComplete (#4230) Co-authored-by: Vincent Baaij <[email protected]> * Update whats new after cherry pick * Try to fix deploy error * Different fix * Take 3 * Take 4 * Take 5 * Take 6 * Disable main brancg in the All-lib YAML file * Prep for next release * Use correct SDK version, update comment --------- Co-authored-by: Denis Voituron <[email protected]> Co-authored-by: MerlinBot <MerlinBot> Co-authored-by: Marvin Klein <[email protected]>
1 parent 3df5b60 commit c5a0da5

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
lines changed

.github/workflows/deploy_demo.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
name: Build and deploy Demo site
2424
env:
25-
DOTNET_VERSION: "net10.0"
25+
DOTNET_VERSION: "net9.0"
2626
DOTNET_CLI_TELEMETRY_OPTOUT: 1
2727
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
2828
DOTNET_NOLOGO: true
@@ -63,7 +63,7 @@ jobs:
6363
- name: .NET Publish
6464
run: dotnet publish ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
6565

66-
- name: Deploy demo site to Azure Static Web App
66+
- name: Deploy demo site to Azure Static Web App
6767
id: builddeploy
6868
uses: Azure/static-web-apps-deploy@v1
6969
with:
@@ -82,7 +82,7 @@ jobs:
8282
runs-on: ubuntu-latest
8383
name: Close Pull Request Job
8484
steps:
85-
- name: Close Pull Request on Azure Static Web App
85+
- name: Close Pull Request on Azure Static Web App
8686
id: closepullrequest
8787
uses: Azure/static-web-apps-deploy@v1
8888
with:

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
1313
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
1414

15-
<VersionFile>4.13.1</VersionFile>
16-
<VersionPrefix>4.13.1</VersionPrefix>
15+
<VersionFile>4.13.2</VersionFile>
16+
<VersionPrefix>4.13.2</VersionPrefix>
1717
<VersionSuffix></VersionSuffix>
1818
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
1919
<FileVersion>$(VersionFile)</FileVersion>

WHATSNEW.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
- \[AppBar\] Add TryGetValue and Apps.ContainsKey ([#4146](https://github.com/microsoft/fluentui-blazor/pull/4146))
3737
- \[Autocomplete\] Add a ShowProgressIndicator parameter + Breaking change ([#4042](https://github.com/microsoft/fluentui-blazor/pull/4042))
3838
- \[AutoComplete\] Invalid aria-controls reference in Autocomplete popup rendering ([#4117](https://github.com/microsoft/fluentui-blazor/pull/4117))
39+
- \[AutoComplete\] Override FocusAsync in FluentAutoComplete ([#4230](https://github.com/microsoft/fluentui-blazor/pull/4230))
3940
- \[DataGrid\] Add MinWidth parameter to ColumnBase ([#4112](https://github.com/microsoft/fluentui-blazor/pull/4112))
4041
- \[DataGrid\] Add public Columns property to DataGridRow and Column property to DataGridCell for easier column access ([#4036](https://github.com/microsoft/fluentui-blazor/pull/4036))
4142
- \[DataGrid\] Asynchronous IQueryable based loading and error handling UI feedback ([#4177](https://github.com/microsoft/fluentui-blazor/pull/4177))

eng/pipelines/build-all-lib.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
# Build all projects (manual).
1+
# Build all projects (tag-based trigger).
22
name: $(FileVersion).$(Year:yy)$(DayOfYear).$(Rev:r)
33

4-
trigger: none # Disable dev and main branches.
4+
trigger:
5+
branches:
6+
include: [] # Explicitly disable branch triggers
7+
tags:
8+
include:
9+
- v* # Triggers on tags like v1.0.0, v2.1.3
510
pr: none # Disable pull request triggers.
611

712
parameters:
@@ -21,9 +26,6 @@ parameters:
2126
variables:
2227
- template: /eng/pipelines/version.yml@self
2328

24-
- name: SignType
25-
value: real
26-
2729
- name: TeamName
2830
value: fluentui-blazor
2931

@@ -69,7 +71,8 @@ extends:
6971
mb:
7072
signing:
7173
enabled: true
72-
signType: $(SignType)
74+
signType: real
75+
signWithProd: true
7376
zipSources: false
7477
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
7578
env:

eng/pipelines/version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ variables:
22
# File and Package version
33
# dev branch: 1.2.4-Preview-23282-1' (PackageSuffix is always ignored in Dev branch)
44
# main branch: 1.2.4-RC.1' (PackageSuffix is ignored, if empty, in Main branch)
5-
FileVersion: '4.13.1' # Set the next final version here.
5+
FileVersion: '4.13.2' # Set the next final version here.
66
PackageSuffix: ''

examples/Demo/Shared/wwwroot/docs/WhatsNew.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
- \[AppBar\] Add TryGetValue and Apps.ContainsKey ([#4146](https://github.com/microsoft/fluentui-blazor/pull/4146))
3737
- \[Autocomplete\] Add a ShowProgressIndicator parameter + Breaking change ([#4042](https://github.com/microsoft/fluentui-blazor/pull/4042))
3838
- \[AutoComplete\] Invalid aria-controls reference in Autocomplete popup rendering ([#4117](https://github.com/microsoft/fluentui-blazor/pull/4117))
39+
- \[AutoComplete\] Override FocusAsync in FluentAutoComplete ([#4230](https://github.com/microsoft/fluentui-blazor/pull/4230))
3940
- \[DataGrid\] Add MinWidth parameter to ColumnBase ([#4112](https://github.com/microsoft/fluentui-blazor/pull/4112))
4041
- \[DataGrid\] Add public Columns property to DataGridRow and Column property to DataGridCell for easier column access ([#4036](https://github.com/microsoft/fluentui-blazor/pull/4036))
4142
- \[DataGrid\] Asynchronous IQueryable based loading and error handling UI feedback ([#4177](https://github.com/microsoft/fluentui-blazor/pull/4177))

0 commit comments

Comments
 (0)