8000 Refactor MSBuild project files by adding the common property file 'Po… · PowerShell/PowerShell@a8e3d89 · GitHub
[go: up one dir, main page]
Skip to content

Commit a8e3d89

Browse files
iSazonovdaxian-dbw
iSazonov
authored and
daxian-dbw
committed
Refactor MSBuild project files by adding the common property file 'PowerShell.Common.props' (#4106)
`AssemblyVersion` and `FileVersion` are now inferred from the `Version` property, which is inferred by `VersionPrefix`. So now both `AssemblyVersion` and `FileVersion` are 6.0.0.0 for each of PowerShell assemblies, and the `ProductVersion` and `InformationalVersion` are 6.0.0.
1 parent ecefb50 commit a8e3d89

File tree

28 files changed

+64
-221
lines changed

28 files changed

+64
-221
lines changed

‎PowerShell.Common.props

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<Product>PowerShell Core</Product>
4+
<Company>Microsoft Corporation</Company>
5+
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
6+
7+
<VersionPrefix>6.0.0</VersionPrefix>
8+
9+
<NeutralLanguage>en-US</NeutralLanguage>
10+
11+
<TargetFramework>netcoreapp2.0</TargetFramework>
12+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
13+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
14+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
15+
16+
<DelaySign>true</DelaySign>
17+
<AssemblyOriginatorKeyFile>../signing/visualstudiopublic.snk</AssemblyOriginatorKeyFile>
18+
<SignAssembly>true</SignAssembly>
19+
</PropertyGroup>
20+
</Project>

‎src/Microsoft.Management.Infrastructure.CimCmdlets/AssemblyInfo.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
using System.Reflection;
88
using System.Runtime.CompilerServices;
99

10-
[assembly:AssemblyFileVersionAttribute("1.0.0.0")]
11-
[assembly:AssemblyVersion("1.0.0.0")]
12-
1310
[assembly:InternalsVisibleTo("Microsoft.Windows.DSC.CoreConfProviders,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
1411
[assembly:InternalsVisibleTo("Microsoft.Management.Infrastructure.CimCmdlets.Test,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
1512
//This is equal to Debuggable(true,true) which enables IsJITTracking and Disable Optimization. CoreCLR does not have constructor Debuggable(true,true)

‎src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="..\..\PowerShell.Common.props"/>
4+
35
<PropertyGroup>
4-
<VersionPrefix>6.0.0</VersionPrefix>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
6-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7-
<DelaySign>true</DelaySign>
6+
<Description>PowerShell Core's Microsoft.Management.Infrastructure.CimCmdlets project</Description>
7+
<NoWarn>$(NoWarn);CS1570;CS1572;CS1573;CS1574;CS1584;CS1587;CS1591</NoWarn>
88
<AssemblyName>Microsoft.Management.Infrastructure.CimCmdlets</AssemblyName>
9-
<AssemblyOriginatorKeyFile>../signing/visualstudiopublic.snk</AssemblyOriginatorKeyFile>
10-
<SignAssembly>true</SignAssembly>
11-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
12-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
139
</PropertyGroup>
1410

1511
<ItemGroup>

‎src/Microsoft.PowerShell.Commands.Diagnostics/AssemblyInfo.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="..\..\PowerShell.Common.props"/>
4+
35
<PropertyGroup>
4-
<VersionPrefix>6.0.0</VersionPrefix>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<Description>PowerShell Core's Microsoft.PowerShell.Commands.Diagnostics project</Description>
67
<NoWarn>$(NoWarn);CS1591</NoWarn>
7-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8-
<DelaySign>true</DelaySign>
9-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
108
<AssemblyName>Microsoft.PowerShell.Commands.Diagnostics</AssemblyName>
11-
<AssemblyOriginatorKeyFile>../signing/visualstudiopublic.snk</AssemblyOriginatorKeyFile>
12-
<SignAssembly>true</SignAssembly>
13-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
14-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
15-
<GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
169
</PropertyGroup>
1710

1811
<ItemGroup>

‎src/Microsoft.PowerShell.Commands.Management/AssemblyInfo.cs

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="..\..\PowerShell.Common.props"/>
4+
35
<PropertyGroup>
4-
<VersionPrefix>6.0.0</VersionPrefix>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<Description>PowerShell Core's Microsoft.PowerShell.Commands.Management project</Description>
67
<NoWarn>$(NoWarn);CS1570</NoWarn>
7-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
9-
<DelaySign>true</DelaySign>
10-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
118
<AssemblyName>Microsoft.PowerShell.Commands.Management</AssemblyName>
12-
<AssemblyOriginatorKeyFile>../signing/visualstudiopublic.snk</AssemblyOriginatorKeyFile>
13-
<SignAssembly>true</SignAssembly>
14-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
15-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
16-
<GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
179
</PropertyGroup>
1810

1911
<ItemGroup>

‎src/Microsoft.PowerShell.Commands.Utility/AssemblyInfo.cs

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="..\..\PowerShell.Common.props"/>
4+
35
<PropertyGroup>
4-
<VersionPrefix>6.0.0</VersionPrefix>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<Description>PowerShell Core's Microsoft.PowerShell.Commands.Utility project</Description>
67
<NoWarn>$(NoWarn);CS1570</NoWarn>
7-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
9-
<DelaySign>true</DelaySign>
10-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
118
<AssemblyName>Microsoft.PowerShell.Commands.Utility</AssemblyName>
12-
<AssemblyOriginatorKeyFile>../signing/visualstudiopublic.snk</AssemblyOriginatorKeyFile>
13-
<SignAssembly>true</SignAssembly>
14-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
15-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
16-
<GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
179
</PropertyGroup>
1810

1911
<ItemGroup>

‎src/Microsoft.PowerShell.ConsoleHost/AssemblyInfo.cs

Lines changed: 1 addition & 14 deletions
6180
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88

99
[assembly: InternalsVisibleTo("powershell-tests,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
1010

11-
#if CORECLR
12-
[assembly: AssemblyCulture("")]
13-
[assembly: NeutralResourcesLanguage("en-US")]
14-
#else
11+
#if !CORECLR
1512
[assembly: AssemblyConfiguration("")]
1613
[assembly: AssemblyInformationalVersionAttribute(@"10.0.10011.16384")]
1714
[assembly: ReliabilityContractAttribute(Consistency.MayCorruptAppDomain, Cer.MayFail)]
@@ -23,13 +20,3 @@
2320
#endif
2421

2522
[assembly: System.Runtime.InteropServices.ComVisible(false)]
26-
[assembly: System.Reflection.AssemblyVersion("3.0.0.0")]
27-
[assembly: System.Reflection.AssemblyProduct("Microsoft (R) Windows (R) Operating System")]
28-
[assembly: System.Reflection.AssemblyCopyright("Copyright (c) Microsoft Corporation. All rights reserved.")]
29-
[assembly: System.Reflection.AssemblyCompany("Microsoft Corporation")]
30-
31-
internal static class AssemblyStrings
32-
{
33-
internal const string AssemblyVersion = @"3.0.0.0";
34-
internal const string AssemblyCopyright = "Copyright (C) 2006 Microsoft Corporation. All rights reserved.";
35-
}

0 commit comments

Comments
 (0)
0