Skip to content

Commit a291834

Browse files
mirichmodaxian-dbw
mirichmo
authored and
daxian-dbw
committed
Revert "Set assembly versions by MSBuild" (PowerShell#4091)
1 parent b7a7e99 commit a291834

28 files changed

Lines changed: 179 additions & 65 deletions

File tree

‎PowerShellCommon.props‎

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
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+
1013
[assembly:InternalsVisibleTo("Microsoft.Windows.DSC.CoreConfProviders,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
1114
[assembly:InternalsVisibleTo("Microsoft.Management.Infrastructure.CimCmdlets.Test,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
1215
//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: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\PowerShellCommon.props"/>
4-
53
<PropertyGroup>
6-
<Description>PowerShell Core's Microsoft.Management.Infrastructure.CimCmdlets project</Description>
7-
<NoWarn>$(NoWarn);CS1570;CS1572;CS1573;CS1574;CS1584;CS1587;CS1591</NoWarn>
4+
<VersionPrefix>6.0.0</VersionPrefix>
5+
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7+
<DelaySign>true</DelaySign>
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>
913
</PropertyGroup>
1014

1115
<ItemGroup>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
using System.Reflection;
22
using System.Resources;
33

4+
[assembly: AssemblyFileVersionAttribute("3.0.0.0")]
5+
[assembly: AssemblyVersion("3.0.0.0")]
6+
47
[assembly: AssemblyCulture("")]
58
[assembly: NeutralResourcesLanguage("en-US")]
69

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

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

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
using System.Reflection;
22
using System.Resources;
33

4+
[assembly: AssemblyFileVersionAttribute("3.0.0.0")]
5+
[assembly: AssemblyVersion("3.0.0.0")]
6+
47
[assembly: AssemblyCulture("")]
58
[assembly: NeutralResourcesLanguage("en-US")]

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

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

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
using System.Reflection;
22
using System.Resources;
33

4+
[assembly: AssemblyFileVersionAttribute("3.0.0.0")]
5+
[assembly: AssemblyVersion("3.0.0.0")]
6+
47
[assembly: AssemblyCulture("")]
58
[assembly: NeutralResourcesLanguage("en-US")]

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

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

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

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,13 @@
2323
#endif
2424

2525
[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)