Skip to content

Commit 477b8ea

Browse files
authored
Merge branch 'microsoft:master' into master
2 parents 4be7c9f + fec35cb commit 477b8ea

10,303 files changed

Lines changed: 194144 additions & 49023 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Tools/CheckDisplayVersions.ps1

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,10 @@ $versionsWithOverlap = $allPackages | ForEach-Object {
113113
}
114114
}
115115
$versionsWithOverlap = $versionsWithOverlap.Where({ $_ })
116-
Write-Verbose "Found $($versionsWithOverlap.count) monikers with multiple packages"
117-
116+
Write-Verbose "Found $($versionsWithOverlap.count) DisplayVersions with multiple packages"
118117

119118
if ($versionsWithOverlap.Count -gt 0) {
120-
Write-Output $versionsWithOverlap
121-
exit 1
119+
$versionsWithOverlap | Format-Table -Wrap
122120
}
123121

124122
class UnmetDependencyException : Exception {
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Created using wingetcreate 1.10.3.0
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.10.0.schema.json
3+
4+
PackageIdentifier: 34u.MultiBaseCSBirdBase
5+
PackageVersion: 5.3.16
6+
InstallerLocale: de-DE
7+
InstallerType: zip
8+
NestedInstallerType: msi
9+
NestedInstallerFiles:
10+
- RelativeFilePath: MultiBaseCS5BirdBase.msi
11+
UpgradeBehavior: install
12+
ProductCode: '{74F7FC20-8E98-4021-BFAC-7C70F6BB0F03}'
13+
Installers:
14+
- Architecture: x86
15+
InstallerUrl: https://www.multibasecs.de/downloads/Files/MultiBaseCS/Version_53/MultiBaseCS5BirdBaseMSI_5316.zip
16+
InstallerSha256: 060D5AA35F16C8FBCADA49921F2611E3D7EA726C8E02CE9692050822F21062C0
17+
ManifestType: installer
18+
ManifestVersion: 1.10.0
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Created using wingetcreate 1.10.3.0
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.10.0.schema.json
3+
4+
PackageIdentifier: 34u.MultiBaseCSBirdBase
5+
PackageVersion: 5.3.16
6+
PackageLocale: de-DE
7+
Publisher: 34u GmbH
8+
PublisherUrl: https://www.multibasecs.de
9+
PublisherSupportUrl: https://www.multibasecs.de/hilfe/
10+
PrivacyUrl: https://www.multibasecs.de/impressum/
11+
PackageName: MultiBaseCS BirdBase
12+
License: Proprietary
13+
ShortDescription: MultiBaseCS BirdBase. Die MultiBaseCS-Edition für die Beringungszentrale Hiddensee.
14+
Documentations:
15+
- DocumentLabel: Manual
16+
DocumentUrl: https://hilfe.multibasecs.de/52_BirdBase/
17+
ManifestType: defaultLocale
18+
ManifestVersion: 1.10.0
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Created using wingetcreate 1.10.3.0
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.10.0.schema.json
3+
4+
PackageIdentifier: 34u.MultiBaseCSBirdBase
5+
PackageVersion: 5.3.16
6+
DefaultLocale: de-DE
7+
ManifestType: version
8+
ManifestVersion: 1.10.0
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Created using wingetcreate 1.10.3.0
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.10.0.schema.json
3+
4+
PackageIdentifier: 34u.MultiBaseCSHome
5+
PackageVersion: 5.3.16
6+
InstallerLocale: de-DE
7+
InstallerType: zip
8+
NestedInstallerType: msi
9+
NestedInstallerFiles:
10+
- RelativeFilePath: MultiBaseCS5Home.msi
11+
UpgradeBehavior: install
12+
ProductCode: '{33E73A86-C65E-40D2-8701-124D18C7C48D}'
13+
Installers:
14+
- Architecture: x86
15+
InstallerUrl: https://www.multibasecs.de/downloads/Files/MultiBaseCS/Version_53/MultiBaseCS5HomeMSI_5316.zip
16+
InstallerSha256: 2983BA4EC264E7FDFDAD71716ECA282C1667775F9AB7446A274B5AEB5A6944CF
17+
ManifestType: installer
18+
ManifestVersion: 1.10.0
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Created using wingetcreate 1.10.3.0
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.10.0.schema.json
3+
4+
PackageIdentifier: 34u.MultiBaseCSHome
5+
PackageVersion: 5.3.16
6+
PackageLocale: de-DE
7+
Publisher: 34u GmbH
8+
PublisherUrl: https://www.multibasecs.de
9+
PublisherSupportUrl: https://www.multibasecs.de/hilfe/
10+
PrivacyUrl: https://www.multibasecs.de/impressum/
11+
PackageName: MultiBaseCS Home
12+
License: Proprietary
13+
ShortDescription: MultiBaseCS Home. Die moderne Artenerfassung.
14+
Documentations:
15+
- DocumentLabel: Manual
16+
DocumentUrl: https://hilfe.multibasecs.de/51_home/
17+
ManifestType: defaultLocale
18+
ManifestVersion: 1.10.0
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Created using wingetcreate 1.10.3.0
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.10.0.schema.json
3+
4+
PackageIdentifier: 34u.MultiBaseCSHome
5+
PackageVersion: 5.3.16
6+
DefaultLocale: de-DE
7+
ManifestType: version
8+
ManifestVersion: 1.10.0
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Created using wingetcreate 1.10.3.0
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.10.0.schema.json
3+
4+
PackageIdentifier: 34u.MultiBaseCSProfessional
5+
PackageVersion: 5.3.16
6+
InstallerLocale: de-DE
7+
InstallerType: zip
8+
NestedInstallerType: msi
9+
NestedInstallerFiles:
10+
- RelativeFilePath: MultiBaseCS5Professional.msi
11+
UpgradeBehavior: install
12+
ProductCode: '{BE1C2C48-157F-4325-9512-D64EAFCACA29}'
13+
Installers:
14+
- Architecture: x86
15+
InstallerUrl: https://www.multibasecs.de/downloads/Files/MultiBaseCS/Version_53/MultiBaseCS5ProMSI_5316.zip
16+
InstallerSha256: 34CF99BC523F74B06A41558F262D172C7DB5335A90E0E1F7B002C9893C870F85
17+
ManifestType: installer
18+
ManifestVersion: 1.10.0
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Created using wingetcreate 1.10.3.0
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.10.0.schema.json
3+
4+
PackageIdentifier: 34u.MultiBaseCSProfessional
5+
PackageVersion: 5.3.16
6+
PackageLocale: de-DE
7+
Publisher: 34u GmbH
8+
PublisherUrl: https://www.multibasecs.de
9+
PublisherSupportUrl: https://www.multibasecs.de/hilfe/
10+
PrivacyUrl: https://www.multibasecs.de/impressum/
11+
PackageName: MultiBaseCS Professional
12+
License: Proprietary
13+
ShortDescription: MultiBaseCS Professional. Die moderne Artenerfassung.
14+
Documentations:
15+
- DocumentLabel: Manual
16+
DocumentUrl: https://hilfe.multibasecs.de/51_professional/
17+
ManifestType: defaultLocale
18+
ManifestVersion: 1.10.0
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Created using wingetcreate 1.10.3.0
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.10.0.schema.json
3+
4+
PackageIdentifier: 34u.MultiBaseCSProfessional
5+
PackageVersion: 5.3.16
6+
DefaultLocale: de-DE
7+
ManifestType: version
8+
ManifestVersion: 1.10.0

0 commit comments

Comments
 (0)