Skip to content

Bump schema & binary version to 1.12 #631

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

Open
mdanish-kh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump schema & binary version to 1.12 #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/WingetCreateCLI/WingetCreateCLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
<AssemblyName>WingetCreateCLI</AssemblyName>
<RootNamespace>Microsoft.WingetCreateCLI</RootNamespace>
<Version>1.10</Version>
<Version>1.12</Version>
<Platforms>x64;x86</Platforms>
<RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
4 changes: 2 additions & 2 deletions src/WingetCreateCore/Models/DefaultLocaleManifestModels.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
}

/// <summary>
/// A representation of a multiple-file manifest representing a default app metadata in the OWC. v1.10.0
/// A representation of a multiple-file manifest representing a default app metadata in the OWC. v1.12.0
/// </summary>
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "11.0.0.0 (Newtonsoft.Json v13.0.0.0)")]
public partial class DefaultLocaleManifest
Expand Down Expand Up @@ -335,7 +335,7 @@ public partial class DefaultLocaleManifest
[Newtonsoft.Json.JsonProperty("ManifestVersion", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
[System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
[System.ComponentModel.DataAnnotations.RegularExpression(@"^(0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])(\.(0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])){2}$")]
public string ManifestVersion { get; set; } = "1.10.0";
public string ManifestVersion { get; set; } = "1.12.0";



Expand Down
12 changes: 10 additions & 2 deletions src/WingetCreateCore/Models/InstallerManifestModels.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ public enum InstallerType
Portable = 10,


[System.Runtime.Serialization.EnumMember(Value = @"font")]
Font = 11,


}

/// <summary>
Expand Down Expand Up @@ -105,6 +109,10 @@ public enum NestedInstallerType
Portable = 8,


[System.Runtime.Serialization.EnumMember(Value = @"font")]
Font = 9,


}

/// <summary>
Expand Down Expand Up @@ -644,7 +652,7 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
}

/// <summary>
/// A representation of a single-file manifest representing an app installers in the OWC. v1.10.0
/// A representation of a single-file manifest representing an app installers in the OWC. v1.12.0
/// </summary>
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "11.0.0.0 (Newtonsoft.Json v13.0.0.0)")]
public partial class InstallerManifest
Expand Down Expand Up @@ -813,7 +821,7 @@ public partial class InstallerManifest
[Newtonsoft.Json.JsonProperty("ManifestVersion", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
[System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
[System.ComponentModel.DataAnnotations.RegularExpression(@"^(0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])(\.(0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])){2}$")]
public string ManifestVersion { get; set; } = "1.10.0";
public string ManifestVersion { get; set; } = "1.12.0";



Expand Down
4 changes: 2 additions & 2 deletions src/WingetCreateCore/Models/LocaleManifestModels.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
}

/// <summary>
/// A representation of a multiple-file manifest representing app metadata in other locale in the OWC. v1.10.0
/// A representation of a multiple-file manifest representing app metadata in other locale in the OWC. v1.12.0
/// </summary>
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "11.0.0.0 (Newtonsoft.Json v13.0.0.0)")]
public partial class LocaleManifest
Expand Down Expand Up @@ -324,7 +324,7 @@ public partial class LocaleManifest
[Newtonsoft.Json.JsonProperty("ManifestVersion", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
[System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
[System.ComponentModel.DataAnnotations.RegularExpression(@"^(0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])(\.(0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])){2}$")]
public string ManifestVersion { get; set; } = "1.10.0";
public string ManifestVersion { get; set; } = "1.12.0";



Expand Down
12 changes: 10 additions & 2 deletions src/WingetCreateCore/Models/SingletonManifestModels.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@ public enum InstallerType
Portable = 10,


[System.Runtime.Serialization.EnumMember(Value = @"font")]
Font = 11,


}

/// <summary>
Expand Down Expand Up @@ -228,6 +232,10 @@ public enum NestedInstallerType
Portable = 8,


[System.Runtime.Serialization.EnumMember(Value = @"font")]
Font = 9,


}

/// <summary>
Expand Down Expand Up @@ -767,7 +775,7 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
}

/// <summary>
/// A representation of a single-file manifest representing an app in the OWC. v1.10.0
/// A representation of a single-file manifest representing an app in the OWC. v1.12.0
/// </summary>
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "11.0.0.0 (Newtonsoft.Json v13.0.0.0)")]
public partial class SingletonManifest
Expand Down Expand Up @@ -1098,7 +1106,7 @@ public partial class SingletonManifest
[Newtonsoft.Json.JsonProperty("ManifestVersion", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
[System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
[System.ComponentModel.DataAnnotations.RegularExpression(@"^(0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])(\.(0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])){2}$")]
public string ManifestVersion { get; set; } = "1.10.0";
public string ManifestVersion { get; set; } = "1.12.0";



Expand Down
4 changes: 2 additions & 2 deletions src/WingetCreateCore/Models/VersionManifestModels.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Microsoft.WingetCreateCore.Models.Version
#pragma warning disable // Disable all warnings

/// <summary>
/// A representation of a multi-file manifest representing an app version in the OWC. v1.10.0
/// A representation of a multi-file manifest representing an app version in the OWC. v1.12.0
/// </summary>
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "11.0.0.0 (Newtonsoft.Json v13.0.0.0)")]
public partial class VersionManifest
Expand Down Expand Up @@ -55,7 +55,7 @@ public partial class VersionManifest
[Newtonsoft.Json.JsonProperty("ManifestVersion", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
[System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
[System.ComponentModel.DataAnnotations.RegularExpression(@"^(0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])(\.(0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])){2}$")]
public string ManifestVersion { get; set; } = "1.10.0";
public string ManifestVersion { get; set; } = "1.12.0";



Expand Down
12 changes: 6 additions & 6 deletions src/WingetCreateCore/WingetCreateCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageReference Include="Microsoft.CorrelationVector" Version="1.0.42" />
<PackageReference Include="Microsoft.Msix.Utils" Version="2.1.1" />
<!--https://docs.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#generatepathproperty-->
<PackageReference Include="Microsoft.WindowsPackageManager.Utils" Version="1.10.340" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.WindowsPackageManager.Utils" Version="1.12.350" GeneratePathProperty="true" />
<PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" />
<PackageReference Include="NLog" Version="5.2.8" />
<PackageReference Include="NSwag.MSBuild" Version="14.0.3">
Expand Down Expand Up @@ -48,11 +48,11 @@
</ItemGroup>

<ItemGroup>
<SchemaFiles Include="$(PkgMicrosoft_WindowsPackageManager_Utils)\content\schemas\JSON\manifests\v1.10.0\manifest.defaultLocale.1.10.0.json" ModelName="DefaultLocale" />
<SchemaFiles Include="$(PkgMicrosoft_WindowsPackageManager_Utils)\content\schemas\JSON\manifests\v1.10.0\manifest.installer.1.10.0.json" ModelName="Installer" />
<SchemaFiles Include="$(PkgMicrosoft_WindowsPackageManager_Utils)\content\schemas\JSON\manifests\v1.10.0\manifest.locale.1.10.0.json" ModelName="Locale" />
<SchemaFiles Include="$(PkgMicrosoft_WindowsPackageManager_Utils)\content\schemas\JSON\manifests\v1.10.0\manifest.version.1.10.0.json" ModelName="Version" />
<SchemaFiles Include="$(PkgMicrosoft_WindowsPackageManager_Utils)\content\schemas\JSON\manifests\v1.10.0\manifest.singleton.1.10.0.json" ModelName="Singleton" />
<SchemaFiles Include="$(PkgMicrosoft_WindowsPackageManager_Utils)\content\schemas\JSON\manifests\v1.12.0\manifest.defaultLocale.1.12.0.json" ModelName="DefaultLocale" />
<SchemaFiles Include="$(PkgMicrosoft_WindowsPackageManager_Utils)\content\schemas\JSON\manifests\v1.12.0\manifest.installer.1.12.0.json" ModelName="Installer" />
<SchemaFiles Include="$(PkgMicrosoft_WindowsPackageManager_Utils)\content\schemas\JSON\manifests\v1.12.0\manifest.locale.1.12.0.json" ModelName="Locale" />
<SchemaFiles Include="$(PkgMicrosoft_WindowsPackageManager_Utils)\content\schemas\JSON\manifests\v1.12.0\manifest.version.1.12.0.json" ModelName="Version" />
<SchemaFiles Include="$(PkgMicrosoft_WindowsPackageManager_Utils)\content\schemas\JSON\manifests\v1.12.0\manifest.singleton.1.12.0.json" ModelName="Singleton" />
</ItemGroup>

<Target Name="PreBuild" BeforeTargets="PreBuildEvent" Inputs="@(SchemaFiles)" Outputs="@(SchemaFiles -> '$(ProjectDir)Models\%(ModelName)ManifestModels.cs')">
Expand Down
157 changes: 157 additions & 0 deletions src/WingetCreateTests/WingetCreateTests/Resources/TestPublisher.FullJsonSingleton1_12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
{
"PackageIdentifier": "TestPublisher.FullYamlSingleton1_12",
"PackageVersion": "0.1.2.3",
"PackageLocale": "en-US",
"DefaultLocale": "en-US",
"Publisher": "TestPublisher",
"PublisherUrl": "https://fakeTestUrl.com",
"PublisherSupportUrl": "https://fakeTestUrl.com",
"PrivacyUrl": "https://fakeTestUrl.com",
"Author": "fakeAuthor",
"PackageName": "Full Singleton 1.12 Test",
"PackageUrl": "https://fakeTestUrl.com",
"License": "MIT",
"LicenseUrl": "https://fakeTestUrl.com",
"Copyright": "fakeCopyright",
"CopyrightUrl": "https://fakeTestUrl.com",
"ShortDescription": "A manifest used to verify that all fields from a full 1.12 singleton manifest can be deserialized and updated.",
"Description": "A manifest used to verify that all fields from a full 1.12 singleton manifest can be deserialized and updated.",
"Moniker": "testMoniker",
"Tags": [
"testSingleton"
],
"Agreements": [
{
"AgreementLabel": "fakeAgreementLabel",
"AgreementUrl": "https://fakeTestUrl.com",
"Agreement": "fakeAgreementContent"
}
],
"ReleaseNotes": "fakeReleaseNotes",
"ReleaseNotesUrl": "https://fakeTestUrl.com",
"PurchaseUrl": "https://fakeTestUrl.com",
"InstallationNotes": "fakeInstallationNotes",
"Documentations": [
{
"DocumentLabel": "fakeDocumentLabel"
},
{
"DocumentUrl": "fakeDocumentUrl"
}
],
"Icons": [
{
"IconUrl": "https://fakeTestIcon",
"IconFileType": "png",
"IconResolution": "32x32",
"IconTheme": "light",
"IconSha256": "69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8321"
}
],
"Installers": [
{
"MinimumOSVersion": "10.0.0.0",
"Architecture": "x64",
"InstallerUrl": "https://fakedomain.com/WingetCreateTestExeInstaller.exe",
"InstallerType": "exe",
"InstallerSha256": "A7803233EEDB6A4B59B3024CCF9292A6FFFB94507DC998AA67C5B745D197A5DC",
"ProductCode": "FakeProductCode",
"PackageFamilyName": "FakePackageFamilyName",
"InstallModes": [
"silent"
],
"InstallerSwitches": {
"Silent": "/s",
"Upgrade": "/u",
"Repair": "/r"
},
"InstallerSuccessCodes": [
1
],
"ExpectedReturnCodes": [
{
"InstallerReturnCode": 123,
"ReturnResponse": "alreadyInstalled",
"ReturnResponseUrl": "https://fakeTestUrl.com"
}
],
"UpgradeBehavior": "install",
"Commands": [
"fakeCommand"
],
"Protocols": [
"fakeProtocol"
],
"FileExtensions": [
".exe"
],
"Dependencies": {
"WindowsFeatures": [
"fakeValue"
],
"WindowsLibraries": [
"fakeValue"
],
"PackageDependencies": [
{
"MinimumVersion": "10.0.0.0"
}
],
"ExternalDependencies": [
"fakeValue"
]
},
"Markets": {
"AllowedMarkets": [
"fakeAllowedMarket"
],
"ExcludedMarkets": [
"fakeExcludedMarket"
]
},
"InstallerAbortsTerminal": true,
"InstallLocationRequired": true,
"RequireExplicitUpgrade": true,
"UnsupportedOSArchitectures": [
"arm64"
],
"AppsAndFeaturesEntries": [
{
"DisplayName": "testName",
"Publisher": "testPublisher",
"DisplayVersion": "testVersion",
"UpgradeCode": "fakeProductCode"
}
],
"ElevationRequirement": "elevationRequired",
"ReleaseDate": "2022-01-01",
"DisplayInstallWarnings": true,
"UnsupportedArguments": [
"log",
"location"
],
"NestedInstallerFiles": [
{
"RelativeFilePath": "RelativeFilePath",
"PortableCommandAlias": "PortableCommandAlias"
}
],
"InstallationMetadata": {
"DefaultInstallLocation": "%ProgramFiles%\\TestApp",
"Files": [
{
"RelativeFilePath": "main.exe",
"FileSha256": "69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82",
"FileType": "launch",
"InvocationParameter": "/arg"
}
]
},
"DownloadCommandProhibited": true,
"RepairBehavior": "modify",
"ArchiveBinariesDependOnPath": true
}
],
"ManifestType": "singleton",
"ManifestVersion": "1.12.0"
}
Loading