Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit928717d

Browse files
committed
Add SharedAssemblyInfo & Update Assembly version
Reset version back down to v2.x from v4.0.0.2See link below for Semanctic Versioning & .NEThttps://codingforsmarties.wordpress.com/2016/01/21/how-to-version-assemblies-destined-for-nuget/
1 parent0e5e58e commit928717d

File tree

11 files changed

+75
-74
lines changed

11 files changed

+75
-74
lines changed

‎src/SharedAssemblyInfo.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
usingSystem;
2+
usingSystem.Reflection;
3+
usingSystem.Resources;
4+
usingSystem.Runtime.InteropServices;
5+
6+
// General Information about an assembly is controlled through the following
7+
// set of attributes. Change these attribute values to modify the information
8+
// associated with an assembly.
9+
[assembly:AssemblyConfiguration("")]
10+
[assembly:AssemblyCompany("pythonnet")]
11+
[assembly:AssemblyProduct("Python for .NET")]
12+
[assembly:AssemblyCopyright("Copyright (c) 2006-2017 the contributors of the 'Python for .NET' project")]
13+
[assembly:AssemblyTrademark("")]
14+
15+
[assembly:AssemblyCulture("")]
16+
[assembly:NeutralResourcesLanguage("")]
17+
18+
[assembly:CLSCompliant(true)]
19+
20+
// Setting ComVisible to false makes the types in this assembly not visible
21+
// to COM components. If you need to access a type in this assembly from
22+
// COM, set the ComVisible attribute to true on that type.
23+
[assembly:ComVisible(false)]
24+
25+
// Version Information. Keeping it simple. May need to revisit for Nuget
26+
// See: https://codingforsmarties.wordpress.com/2016/01/21/how-to-version-assemblies-destined-for-nuget/
27+
// AssemblyVersion can only be numeric
28+
[assembly:AssemblyVersion("2.3.0")]

‎src/clrmodule/AssemblyInfo.cs

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

‎src/clrmodule/ClrModule.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public static void initclr()
5252
varpythonRuntimeName=newAssemblyName("Python.Runtime")
5353
{
5454
#ifUSE_PYTHON_RUNTIME_VERSION
55-
Version=newVersion("4.0.0.1"),
55+
// Has no effect until SNK works. Keep updated anyways.
56+
Version=newVersion("2.3.0"),
5657
#endif
5758
CultureInfo= CultureInfo.InvariantCulture
5859
};
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
usingSystem.Reflection;
2+
usingSystem.Runtime.InteropServices;
3+
4+
// General Information about an assembly is controlled through the following
5+
// set of attributes. Change these attribute values to modify the information
6+
// associated with an assembly.
7+
[assembly:AssemblyTitle("clrmodule")]
8+
[assembly:AssemblyDescription("")]
9+
10+
// The following GUID is for the ID of the typelib if this project is exposed to COM
11+
[assembly:Guid("ae10d6a4-55c2-482f-9716-9988e6c169e3")]

‎src/clrmodule/clrmodule.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<NoWarn>1591</NoWarn>
1515
<SolutionDirCondition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1616
<PythonBuildDirCondition=" '$(PythonBuildDir)' == ''">$(SolutionDir)</PythonBuildDir>
17+
<AppDesignerFolder>Properties</AppDesignerFolder>
1718
<!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
1819
<RestorePackages>true</RestorePackages>
1920
<ErrorReport>prompt</ErrorReport>
@@ -72,7 +73,10 @@
7273
<ReferenceInclude="System" />
7374
</ItemGroup>
7475
<ItemGroup>
75-
<CompileInclude="AssemblyInfo.cs" />
76+
<CompileInclude="Properties\AssemblyInfo.cs" />
77+
<CompileInclude="..\SharedAssemblyInfo.cs">
78+
<Link>Properties\SharedAssemblyInfo.cs</Link>
79+
</Compile>
7680
<CompileInclude="ClrModule.cs" />
7781
</ItemGroup>
7882
<ItemGroup>

‎src/console/AssemblyInfo.cs

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

‎src/console/Console.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<NoWarn>1591</NoWarn>
1515
<SolutionDirCondition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1616
<PythonBuildDirCondition=" '$(PythonBuildDir)' == ''">$(SolutionDir)</PythonBuildDir>
17+
<AppDesignerFolder>Properties</AppDesignerFolder>
1718
<!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
1819
<ApplicationIcon>python-clear.ico</ApplicationIcon>
1920
<ErrorReport>prompt</ErrorReport>
@@ -71,7 +72,10 @@
7172
<ReferenceInclude="System" />
7273
</ItemGroup>
7374
<ItemGroup>
74-
<CompileInclude="AssemblyInfo.cs" />
75+
<CompileInclude="Properties\AssemblyInfo.cs" />
76+
<CompileInclude="..\SharedAssemblyInfo.cs">
77+
<Link>Properties\SharedAssemblyInfo.cs</Link>
78+
</Compile>
7579
<CompileInclude="pythonconsole.cs" />
7680
</ItemGroup>
7781
<ItemGroup>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
usingSystem.Reflection;
2+
3+
// General Information about an assembly is controlled through the following
4+
// set of attributes. Change these attribute values to modify the information
5+
// associated with an assembly.
6+
[assembly:AssemblyTitle("Python Console")]
7+
[assembly:AssemblyDescription("")]
8+
[assembly:AssemblyDefaultAlias("python.exe")]

‎src/runtime/AssemblyInfo.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
usingSystem.Reflection;
2+
usingSystem.Runtime.CompilerServices;
3+
4+
// General Information about an assembly is controlled through the following
5+
// set of attributes. Change these attribute values to modify the information
6+
// associated with an assembly.
7+
[assembly:AssemblyTitle("Python for .NET")]
8+
[assembly:AssemblyDescription("")]
9+
[assembly:AssemblyDefaultAlias("Python.Runtime.dll")]
10+
11+
[assembly:InternalsVisibleTo("Python.EmbeddingTest")]

‎src/runtime/Python.Runtime.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<NoWarn>1591</NoWarn>
1515
<SolutionDirCondition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1616
<PythonBuildDirCondition=" '$(PythonBuildDir)' == ''">$(SolutionDir)</PythonBuildDir>
17+
<AppDesignerFolder>Properties</AppDesignerFolder>
1718
<!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
1819
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1920
<SignAssembly>false</SignAssembly>
@@ -73,7 +74,10 @@
7374
<ReferenceInclude="System" />
7475
</ItemGroup>
7576
<ItemGroup>
76-
<CompileInclude="AssemblyInfo.cs" />
77+
<CompileInclude="Properties\AssemblyInfo.cs" />
78+
<CompileInclude="..\SharedAssemblyInfo.cs">
79+
<Link>Properties\SharedAssemblyInfo.cs</Link>
80+
</Compile>
7781
<CompileInclude="arrayobject.cs" />
7882
<CompileInclude="assemblymanager.cs" />
7983
<CompileInclude="classderived.cs" />

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp