Skip to content

Add normalized name and publisher to index and correlation telemetry #767

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.

Sign up for GitHub

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
JohnMcPMS merged 17 commits into from
Mar 2, 2021
Merged

Add normalized name and publisher to index and correlation telemetry #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
68313c6
Most of the wrote work for correlation, but requires index to contain…
JohnMcPMS Feb 9, 2021
b7625eb
In progress work to add normalized name to index
JohnMcPMS Feb 16, 2021
1ffdfef
Builds after adding 1.3; needs tests
JohnMcPMS Feb 18, 2021
5090308
Builds and all feature work done
JohnMcPMS Feb 22, 2021
e0722a7
Test fixes for existing tests
JohnMcPMS Feb 22, 2021
56fd0d1
Merge from upstream by lines; does not build
JohnMcPMS Feb 23, 2021
cf4b61c
Updates for merge with manifest changes, builds
JohnMcPMS Feb 23, 2021
5a3f28d
Add tests
JohnMcPMS Feb 24, 2021
d3509e3
Add words and spelling files to solution
JohnMcPMS Feb 24, 2021
3c8ab9e
Updates from manual testing
JohnMcPMS Feb 24, 2021
88f492d
Revert changing Id for now as it causes too many conflicts
JohnMcPMS Feb 25, 2021
5e71e7c
Fix potential AV in test installer and flush each log line to help de…
JohnMcPMS Feb 25, 2021
f6628d2
Fix AV in test installer
JohnMcPMS Feb 25, 2021
b5d18e6
Change test run names, update main manifest to use actual log file, a…
JohnMcPMS Feb 27, 2021
20c60ee
PR feedback
JohnMcPMS Mar 1, 2021
8bc22ac
Spelling addition
JohnMcPMS Mar 1, 2021
5852f27
Apply CG change here with test fixes
JohnMcPMS Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/actions/spelling/allow.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ Linux
LOCALAPPDATA
localtime
LOGPATH
logsql
logto
LONGLONG
LPCGUID
Expand All @@ -201,6 +202,7 @@ MAKEINTRESOURCE
makemsix
MANIFESTSCHEMA
MANIFESTVERSION
MBs
mday
metadata
microsoft
Expand Down Expand Up @@ -414,6 +416,7 @@ triaged
trunc
TRUSTEDPEOPLE
tt
ttl
typedef
typename
uap
Expand Down
1 change: 1 addition & 0 deletions .github/actions/spelling/expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ casemap
casemappings
cch
CDEF
cend
centralus
certmgr
certs
Expand Down
3 changes: 3 additions & 0 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ jobs:
- task: VSTest@2
displayName: Run E2E Tests Packaged x64
inputs:
testRunTitle: 'E2E Packaged x64'
testSelector: 'testAssemblies'
testAssemblyVer2: 'src\x64\Release\AppInstallerCLIE2ETests\AppInstallerCLIE2ETests.dll'
runSettingsFile: 'src\x64\Release\AppInstallerCLIE2ETests\Test.runsettings'
Expand All @@ -265,6 +266,7 @@ jobs:
- task: VSTest@2
displayName: Run E2E Tests Packaged x86
inputs:
testRunTitle: 'E2E Packaged x86'
testSelector: 'testAssemblies'
testAssemblyVer2: 'src\x86\Release\AppInstallerCLIE2ETests\AppInstallerCLIE2ETests.dll'
runSettingsFile: 'src\x86\Release\AppInstallerCLIE2ETests\Test.runsettings'
Expand Down Expand Up @@ -310,6 +312,7 @@ jobs:

- task: ComponentGovernanceComponentDetection@0
displayName: Component Governance
continueOnError: true
inputs:
scanType: 'Register'
verbosity: 'Verbose'
Expand Down
11 changes: 10 additions & 1 deletion src/AppInstallerCLI.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project", "Project", "{8D53
..\azure-pipelines.loc.yml = ..\azure-pipelines.loc.yml
..\azure-pipelines.yml = ..\azure-pipelines.yml
..\cgmanifest.json = ..\cgmanifest.json
..\README.md = ..\README.md
..\doc\packages.schema.json = ..\doc\packages.schema.json
..\README.md = ..\README.md
..\doc\Settings.md = ..\doc\Settings.md
..\doc\settings.schema.json = ..\doc\settings.schema.json
EndProjectSection
Expand Down Expand Up @@ -68,6 +68,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Valijson", "Valijson\Valijs
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ManifestSchema", "ManifestSchema\ManifestSchema.vcxitems", "{7D05F64D-CE5A-42AA-A2C1-E91458F061CF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "spelling", "spelling", "{2ACDE176-F13F-42FA-8159-C34FA3D37837}"
ProjectSection(SolutionItems) = preProject
..\.github\actions\spelling\allow.txt = ..\.github\actions\spelling\allow.txt
..\.github\actions\spelling\excludes.txt = ..\.github\actions\spelling\excludes.txt
..\.github\actions\spelling\expect.txt = ..\.github\actions\spelling\expect.txt
..\.github\actions\spelling\patterns.txt = ..\.github\actions\spelling\patterns.txt
EndProjectSection
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
ManifestSchema\ManifestSchema.vcxitems*{1622da16-914f-4f57-a259-d5169003cc8c}*SharedItemsImports = 4
Expand Down Expand Up @@ -429,6 +437,7 @@ Global
{3BAF989F-7F65-465B-ACE8-BAFE42D1017E} = {EA8CD934-0702-4911-A2C5-A40600E616DE}
{358BC478-0624-4AD1-A933-0422B5292AF8} = {60618CAC-2995-4DF9-9914-45C6FC02C995}
{7D05F64D-CE5A-42AA-A2C1-E91458F061CF} = {8D53D749-D51C-46F8-A162-9371AAA6C2E7}
{2ACDE176-F13F-42FA-8159-C34FA3D37837} = {8D53D749-D51C-46F8-A162-9371AAA6C2E7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B6FDB70C-A751-422C-ACD1-E35419495857}
Expand Down
1 change: 1 addition & 0 deletions src/AppInstallerCLICore/AppInstallerCLICore.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
<ClInclude Include="Commands\SettingsCommand.h" />
<ClInclude Include="CompletionData.h" />
<ClInclude Include="ExecutionArgs.h" />
<ClInclude Include="ExecutionContextData.h" />
<ClInclude Include="ExecutionContext.h" />
<ClInclude Include="ExecutionProgress.h" />
<ClInclude Include="ExecutionReporter.h" />
Expand Down
8 changes: 4 additions & 4 deletions src/AppInstallerCLICore/AppInstallerCLICore.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@
<ClInclude Include="ExecutionReporter.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ExecutionContext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ExecutionArgs.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -149,7 +146,10 @@
<ClInclude Include="Commands\ImportCommand.h">
<Filter>Commands</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<ClInclude Include="ExecutionContextData.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ExecutionContext.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
Expand Down
19 changes: 2 additions & 17 deletions src/AppInstallerCLICore/Commands/UpgradeCommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,28 +150,20 @@ namespace AppInstaller::CLI
// --manifest case where new manifest is provided
context <<
GetManifestFromArg <<
ReportManifestIdentity <<
SearchSourceUsingManifest <<
EnsureOneMatchFromSearchResult(true) <<
GetInstalledPackageVersion <<
EnsureUpdateVersionApplicable <<
SelectInstaller <<
EnsureApplicableInstaller <<
ShowInstallationDisclaimer <<
Workflow::ReportExecutionStage(ExecutionStage::Download) <<
DownloadInstaller <<
Workflow::ReportExecutionStage(ExecutionStage::Execution) <<
ExecuteInstaller <<
Workflow::ReportExecutionStage(ExecutionStage::PostExecution) <<
RemoveInstaller;
InstallPackageInstaller;
}
else
{
// The remaining case: search for single installed package to update
context <<
SearchSourceForSingle <<
EnsureOneMatchFromSearchResult(true) <<
ReportPackageIdentity <<
GetInstalledPackageVersion;

if (context.Args.Contains(Execution::Args::Type::Version))
Expand All @@ -190,14 +182,7 @@ namespace AppInstaller::CLI
context << SelectLatestApplicableUpdate(true);
}

context <<
ShowInstallationDisclaimer <<
Workflow::ReportExecutionStage(ExecutionStage::Download) <<
DownloadInstaller <<
Workflow::ReportExecutionStage(ExecutionStage::Execution) <<
ExecuteInstaller <<
Workflow::ReportExecutionStage(ExecutionStage::PostExecution) <<
RemoveInstaller;
context << InstallPackageInstaller;
}
}
}
Loading