Skip to content
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

build: merge main back to dev #11232

Merged
merged 26 commits into from
Mar 29, 2024
Merged

build: merge main back to dev #11232

merged 26 commits into from
Mar 29, 2024

Conversation

LongOddCode
Copy link
Contributor

No description provided.

ZYUN-MSFT and others added 26 commits March 21, 2024 11:43
* refactor: office xml addin string and readme

* refactor: office xml addin string and readme
* fix: add treeview telemetry rebase to main branch

* fix: delete telemetry test env variable

* refactor: added common isOfficeAddin property

* fix: replace isOfficeAddin by officeProjectType

* fix: remove telemetry test configuration

* fix: remove unused err from officeDevHandlers

* fix: remove useless initialization of 'officeProjectType' property

* fix: change officeProjectType to officecAddinProjectType

---------

Co-authored-by: Ruiqi Yang (from Dev Box) <[email protected]>
build(release): merge dev into main branch
* split different task to separate terminal

* fix manifest

* fix string content
feat: force the feature OfficeAddin to close[MetaOS]
…eXMLAddin

refactor: disable create office xml addin
build: merge hotfix/wxp-mar to main
@@ -6,6 +6,7 @@
import { TOOLS, globalVars } from "../core/globalVars";
import { ProjectTypeResult } from "./projectTypeChecker";
import { assign } from "lodash";
import { ProjectType } from "@microsoft/m365-spec-parser";

Check notice

Code scanning / CodeQL

Unused variable, import, function or class Note

Unused import ProjectType.
Copy link

codecov bot commented Mar 29, 2024

Codecov Report

Attention: Patch coverage is 92.53731% with 5 lines in your changes are missing coverage. Please review.

Project coverage is 87.26%. Comparing base (654c223) to head (bf8c72e).

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##              dev   #11232      +/-   ##
==========================================
+ Coverage   87.24%   87.26%   +0.02%     
==========================================
  Files         458      458              
  Lines       27903    27942      +39     
  Branches     5613     5617       +4     
==========================================
+ Hits        24343    24383      +40     
  Misses       1788     1788              
+ Partials     1772     1771       -1     
Files Coverage Δ
packages/fx-core/src/common/featureFlags.ts 97.67% <100.00%> (ø)
packages/fx-core/src/common/telemetry.ts 98.12% <100.00%> (-0.02%) ⬇️
...omponent/generator/officeXMLAddin/projectConfig.ts 100.00% <ø> (ø)
packages/fx-core/src/error/script.ts 100.00% <ø> (ø)
packages/fx-core/src/question/create.ts 91.75% <100.00%> (+0.06%) ⬆️
...-core/src/question/options/CreateProjectOptions.ts 100.00% <ø> (ø)
packages/vscode-extension/src/officeDevHandlers.ts 95.08% <100.00%> (+0.79%) ⬆️
...code-extension/src/telemetry/extTelemetryEvents.ts 100.00% <100.00%> (ø)
...rc/component/generator/officeXMLAddin/generator.ts 98.24% <91.66%> (+9.78%) ⬆️
packages/fx-core/src/common/projectTypeChecker.ts 89.54% <50.00%> (-2.19%) ⬇️

@MSFT-yiz MSFT-yiz merged commit 95cbc7d into dev Mar 29, 2024
17 of 19 checks passed
@MSFT-yiz MSFT-yiz deleted the long/fork-dev branch March 29, 2024 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants