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.

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

Jump to bottom

[Chore] Update copyright and remove the year #30689

Merged
merged 10 commits into from
Jan 18, 2024
Merged

[Chore] Update copyright and remove the year #30689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1ba8a4e
Update Directory.Build.props
Aaron-Junker Jan 1, 2024
f2dd6ad
Update version.h
Aaron-Junker Jan 1, 2024
6f39a4b
Update Directory.Build.props
Aaron-Junker Jan 16, 2024
339f001
Update version.h
Aaron-Junker Jan 16, 2024
3059157
Update Directory.Build.props
Aaron-Junker Jan 16, 2024
9261e20
Update version.h
Aaron-Junker Jan 16, 2024
93ae96b
Update versionAndSignCheck.ps1
Aaron-Junker Jan 16, 2024
cf3e5d4
Merge branch 'main' into dev/aaron-junker/change-copyright-year
Aaron-Junker Jan 16, 2024
3ec70ad
Oops
Aaron-Junker Jan 16, 2024
137f2f4
Merge branch 'main' into pr30689
jaimecbernardo Jan 18, 2024
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
7 changes: 1 addition & 6 deletions .pipelines/versionAndSignCheck.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,6 @@ $items | ForEach-Object {
Write-Host "Version not set: " + $_.FullName
$totalFailure++;
}
elseif ($_.VersionInfo.ProductName -contains "PowerToys" -and $_.VersionInfo.LegalCopyright -notmatch "Copyright \(C\) $((Get-Date).Year)") {
# PowerToys assemblies that aren't updated to the current year in the copyright
Write-Host "Copyright year out of date: " + $_.FullName
$totalFailure++;
}
else {
$auth = Get-AuthenticodeSignature $_.FullName
if ($auth.SignerCertificate -eq $null) {
Expand All @@ -86,4 +81,4 @@ if ($totalFailure -gt 0) {
exit 1
}

exit 0
exit 0
6 changes: 3 additions & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>

<PropertyGroup>
<Copyright>Copyright (C) 2024 Microsoft Corporation</Copyright>
<Copyright>Copyright (C) Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyCompany>Microsoft Corp.</AssemblyCompany>
<AssemblyCopyright>Copyright (C) 2024 Microsoft Corporation</AssemblyCopyright>
<AssemblyCopyright>Copyright (C) Microsoft Corporation. All rights reserved.</AssemblyCopyright>
<AssemblyProduct>PowerToys</AssemblyProduct>
<Company>Microsoft Corporation</Company>
<NeutralLanguage>en-US</NeutralLanguage>
Expand Down Expand Up @@ -86,4 +86,4 @@
<Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).props" />
<Import Project="$(MSBuildCacheSharedCompilationPackageRoot)\build\Microsoft.MSBuildCache.SharedCompilation.props" />
</ImportGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/common/version/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#define PRODUCT_VERSION_STRING FILE_VERSION_STRING

#define COMPANY_NAME "Microsoft Corporation"
#define COPYRIGHT_NOTE "Copyright (C) 2024 Microsoft Corporation"
#define COPYRIGHT_NOTE "Copyright (C) Microsoft Corporation. All rights reserved."
#define PRODUCT_NAME "PowerToys"

#include <string>
Expand Down Expand Up @@ -43,4 +43,4 @@ inline std::wstring get_std_product_version()
L"." + std::to_wstring(VERSION_REVISION) + L".0";

return version;
}
}
Loading