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

Undocked Package API #3291

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions WindowsAppRuntime.sln
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,9 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ChangeTracker", "dev\EnvironmentManager\ChangeTracker\ChangeTracker.vcxitems", "{E15C3465-9D45-495D-92CE-B91EF45E8623}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsAppRuntime_MSIXInstallFromPath", "dev\WindowsAppRuntime_MSIXInstallFromPath\WindowsAppRuntime_MSIXInstallFromPath.vcxproj", "{D45D4170-E055-4926-8B03-04DAA5F02C6C}"
ProjectSection(ProjectDependencies) = postProject
{BF3FCED0-CADB-490A-93A7-4D90E1F45AB0} = {BF3FCED0-CADB-490A-93A7-4D90E1F45AB0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Framework.Widgets", "test\DynamicDependency\data\Framework.Widgets\Framework.Widgets.vcxproj", "{09DDAE21-397F-4263-8561-7F2FF28127CF}"
EndProject
Expand Down Expand Up @@ -423,6 +426,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VersionInfoTests", "test\Ve
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FrameworkUdk.PackageReference", "eng\PackageReference\FrameworkUdk\Microsoft.FrameworkUdk.PackageReference.csproj", "{FD0CC14A-ED4B-4936-B68B-F31E58372E32}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MSIX.Package", "MSIX.Package", "{AF2F6D25-AC23-471E-B5C5-0F7BFB0315D9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSIXPackage", "dev\MSIX.Package\MSIX.Package.vcxitems", "{9313B570-83C2-4474-BC23-414B31EC4D15}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1721,6 +1728,8 @@ Global
{2A2D1131-273C-4E17-BCD3-8812170A4B95} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
{E3EDEC7F-A24E-4766-BB1D-6BDFBA157C51} = {2A2D1131-273C-4E17-BCD3-8812170A4B95}
{442FB943-1197-48FE-B3B6-8C1BCA1E81E4} = {8630F7AA-2969-4DC9-8700-9B468C1DC21D}
{AF2F6D25-AC23-471E-B5C5-0F7BFB0315D9} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
{9313B570-83C2-4474-BC23-414B31EC4D15} = {AF2F6D25-AC23-471E-B5C5-0F7BFB0315D9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}
Expand All @@ -1738,6 +1747,7 @@ Global
dev\Common\Common.vcxitems*{8828053c-d6ec-4744-8624-f8c676c2d4df}*SharedItemsImports = 9
dev\Licensing\Licensing.vcxitems*{885a43fa-052d-4b0d-a2dc-13ee15796435}*SharedItemsImports = 9
test\inc\inc.vcxitems*{8e52d7ea-a200-4a6b-ba74-8efb49468caf}*SharedItemsImports = 4
dev\MSIX.Package\MSIX.Package.vcxitems*{9313b570-83c2-4474-bc23-414b31ec4d15}*SharedItemsImports = 9
dev\AppNotifications\AppNotifications.vcxitems*{b4824897-88e0-4927-8fb9-e60106f01ed9}*SharedItemsImports = 9
test\inc\inc.vcxitems*{b567fe2e-3a03-48d0-b2b5-760cdec35891}*SharedItemsImports = 9
dev\Common\Common.vcxitems*{b73ad907-6164-4294-88fb-f3c9c10da1f1}*SharedItemsImports = 4
Expand Down
14 changes: 14 additions & 0 deletions build/NuSpecs/AppxManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,20 @@
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.DynamicDependency.PackageDependencyContext" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.DynamicDependency.PackageDependencyRank" ThreadingModel="both" />

<!-- Package -->
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.FindPackageOptions" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.FindRelatedPackagesOptions" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.Package" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.PackageApplications" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.PackageContentGroups" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.PackageDisplayInfo" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.PackageFamilyIdentity" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.PackageGraph" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.PackageIdentity" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.PackageInstallInfo" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.PackageLocation" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.PackageStatus" ThreadingModel="both" />

<!-- Deployment -->
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.WindowsAppRuntime.DeploymentManager" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.WindowsAppRuntime.DeploymentResult" ThreadingModel="both" />
Expand Down
124 changes: 124 additions & 0 deletions dev/MSIX.Package/M.W.AM.FindPackageOptions.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

#include <pch.h>

#include "M.W.AM.FindPackageOptions.h"

#include "Microsoft.Windows.ApplicationModel.FindPackageOptions.g.cpp"

namespace winrt::Microsoft::Windows::ApplicationModel::implementation
{
winrt::Windows::System::User FindPackageOptions::User()
{
throw hresult_not_implemented();
}
void FindPackageOptions::User(winrt::Windows::System::User const& value)
{
throw hresult_not_implemented();
}
hstring FindPackageOptions::PackageFullName()
{
return m_packageFullName;
}
void FindPackageOptions::PackageFullName(hstring const& value)
{
m_packageFullName = value;
}
hstring FindPackageOptions::PackageFamilyName()
{
return m_packageFamilyName;
}
void FindPackageOptions::PackageFamilyName(hstring const& value)
{
m_packageFamilyName = value;
}
hstring FindPackageOptions::PackageName()
{
return m_packageName;
}
void FindPackageOptions::PackageName(hstring const& value)
{
m_packageName = value;
}
hstring FindPackageOptions::PackagePublisher()
{
return m_packagePublisher;
}
void FindPackageOptions::PackagePublisher(hstring const& value)
{
m_packagePublisher = value;
}
hstring FindPackageOptions::PackagePublisherId()
{
return m_packagePublisherId;
}
void FindPackageOptions::PackagePublisherId(hstring const& value)
{
m_packagePublisherId = value;
}
bool FindPackageOptions::IsMain()
{
return m_isMain;
}
void FindPackageOptions::IsMain(bool value)
{
m_isMain = value;
}
bool FindPackageOptions::IsFramework()
{
return m_isFramework;
}
void FindPackageOptions::IsFramework(bool value)
{
m_isFramework = value;
}
bool FindPackageOptions::IsResource()
{
return m_isResource;
}
void FindPackageOptions::IsResource(bool value)
{
m_isResource = value;
}
bool FindPackageOptions::IsOptional()
{
return m_isOptional;
}
void FindPackageOptions::IsOptional(bool value)
{
m_isOptional = value;
}
bool FindPackageOptions::IsOptionalInRelatedSet()
{
return m_isOptionalInRelatedSet;
}
void FindPackageOptions::IsOptionalInRelatedSet(bool value)
{
m_isOptionalInRelatedSet = value;
}
bool FindPackageOptions::IsOptionalNotInRelatedSet()
{
return m_isOptionalNotInRelatedSet;
}
void FindPackageOptions::IsOptionalNotInRelatedSet(bool value)
{
m_isOptionalNotInRelatedSet = value;
}
bool FindPackageOptions::IsBundle()
{
return m_isBundle;
}
void FindPackageOptions::IsBundle(bool value)
{
m_isBundle = value;
}
bool FindPackageOptions::IsProvisioned()
{
return m_isProvisioned;
}
void FindPackageOptions::IsProvisioned(bool value)
{
m_isProvisioned = value;
}
}
65 changes: 65 additions & 0 deletions dev/MSIX.Package/M.W.AM.FindPackageOptions.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

#pragma once

#include "Microsoft.Windows.ApplicationModel.FindPackageOptions.g.h"

namespace winrt::Microsoft::Windows::ApplicationModel::implementation
{
struct FindPackageOptions : FindPackageOptionsT<FindPackageOptions>
{
FindPackageOptions() = default;

winrt::Windows::System::User User();
void User(winrt::Windows::System::User const& value);
hstring PackageFullName();
void PackageFullName(hstring const& value);
hstring PackageFamilyName();
void PackageFamilyName(hstring const& value);
hstring PackageName();
void PackageName(hstring const& value);
hstring PackagePublisher();
void PackagePublisher(hstring const& value);
hstring PackagePublisherId();
void PackagePublisherId(hstring const& value);
bool IsMain();
void IsMain(bool value);
bool IsFramework();
void IsFramework(bool value);
bool IsResource();
void IsResource(bool value);
bool IsOptional();
void IsOptional(bool value);
bool IsOptionalInRelatedSet();
void IsOptionalInRelatedSet(bool value);
bool IsOptionalNotInRelatedSet();
void IsOptionalNotInRelatedSet(bool value);
bool IsBundle();
void IsBundle(bool value);
bool IsProvisioned();
void IsProvisioned(bool value);

private:
//TODO winrt::Windows::System::User m_user;
hstring m_packageFullName;
hstring m_packageFamilyName;
hstring m_packageName;
hstring m_packagePublisher;
hstring m_packagePublisherId;
bool m_isMain{};
bool m_isFramework{};
bool m_isResource{};
bool m_isOptional{};
bool m_isOptionalInRelatedSet{};
bool m_isOptionalNotInRelatedSet{};
bool m_isBundle{};
bool m_isProvisioned{};
};
}
namespace winrt::Microsoft::Windows::ApplicationModel::factory_implementation
{
struct FindPackageOptions : FindPackageOptionsT<FindPackageOptions, implementation::FindPackageOptions>
{
};
}
56 changes: 56 additions & 0 deletions dev/MSIX.Package/M.W.AM.FindRelatedPackagesOptions.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

#include <pch.h>

#include "M.W.AM.FindRelatedPackagesOptions.h"

#include "Microsoft.Windows.ApplicationModel.FindRelatedPackagesOptions.g.cpp"

namespace winrt::Microsoft::Windows::ApplicationModel::implementation
{
FindRelatedPackagesOptions::FindRelatedPackagesOptions(winrt::Microsoft::Windows::ApplicationModel::PackageRelationship const& Relationship) :
m_relationship(Relationship)
{
}
winrt::Microsoft::Windows::ApplicationModel::PackageRelationship FindRelatedPackagesOptions::Relationship()
{
return m_relationship;
}
void FindRelatedPackagesOptions::Relationship(winrt::Microsoft::Windows::ApplicationModel::PackageRelationship const& value)
{
m_relationship = value;
}
bool FindRelatedPackagesOptions::IncludeFrameworks()
{
return m_includeFrameworks;
}
void FindRelatedPackagesOptions::IncludeFrameworks(bool value)
{
m_includeFrameworks = value;
}
bool FindRelatedPackagesOptions::IncludeHostRuntimes()
{
return m_includeHostRuntimes;
}
void FindRelatedPackagesOptions::IncludeHostRuntimes(bool value)
{
m_includeHostRuntimes = value;
}
bool FindRelatedPackagesOptions::IncludeOptionals()
{
return m_includeOptionals;
}
void FindRelatedPackagesOptions::IncludeOptionals(bool value)
{
m_includeOptionals = value;
}
bool FindRelatedPackagesOptions::IncludeResources()
{
return m_includeResources;
}
void FindRelatedPackagesOptions::IncludeResources(bool value)
{
m_includeResources = value;
}
}
39 changes: 39 additions & 0 deletions dev/MSIX.Package/M.W.AM.FindRelatedPackagesOptions.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Copyright (c) Microsoft Corporation and Contributors.
// Licensed under the MIT License.

#pragma once

#include "Microsoft.Windows.ApplicationModel.FindRelatedPackagesOptions.g.h"

namespace winrt::Microsoft::Windows::ApplicationModel::implementation
{
struct FindRelatedPackagesOptions : FindRelatedPackagesOptionsT<FindRelatedPackagesOptions>
{
FindRelatedPackagesOptions() = default;

FindRelatedPackagesOptions(winrt::Microsoft::Windows::ApplicationModel::PackageRelationship const& Relationship);
winrt::Microsoft::Windows::ApplicationModel::PackageRelationship Relationship();
void Relationship(winrt::Microsoft::Windows::ApplicationModel::PackageRelationship const& value);
bool IncludeFrameworks();
void IncludeFrameworks(bool value);
bool IncludeHostRuntimes();
void IncludeHostRuntimes(bool value);
bool IncludeOptionals();
void IncludeOptionals(bool value);
bool IncludeResources();
void IncludeResources(bool value);

private:
winrt::Microsoft::Windows::ApplicationModel::PackageRelationship m_relationship{ winrt::Microsoft::Windows::ApplicationModel::PackageRelationship::Dependencies };
bool m_includeFrameworks{};
bool m_includeHostRuntimes{};
bool m_includeOptionals{};
bool m_includeResources{};
};
}
namespace winrt::Microsoft::Windows::ApplicationModel::factory_implementation
{
struct FindRelatedPackagesOptions : FindRelatedPackagesOptionsT<FindRelatedPackagesOptions, implementation::FindRelatedPackagesOptions>
{
};
}
Loading