Skip to content

Commit 25e4aa1

Browse files
PathoschildPathoschild
committed
remove legacy AssemblyInfo and GlobalAssemblyInfo files, use consistent assembly names
1 parent 49b3dbb commit 25e4aa1

32 files changed

Lines changed: 49 additions & 123 deletions

File tree

‎build/GlobalAssemblyInfo.cs‎

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

‎build/common.targets‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
<!--set properties -->
66
<PropertyGroup>
7+
<Version>3.0.0</Version>
8+
<Product>SMAPI</Product>
9+
710
<AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>
811
<DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);SMAPI_FOR_WINDOWS</DefineConstants>
912
</PropertyGroup>

‎docs/technical/smapi.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ argument | purpose
5050

5151
### Compile flags
5252
SMAPI uses a small number of conditional compilation constants, which you can set by editing the
53-
`<DefineConstants>` element in `StardewModdingAPI.csproj`. Supported constants:
53+
`<DefineConstants>` element in `SMAPI.csproj`. Supported constants:
5454

5555
flag | purpose
5656
---- | -------
@@ -71,17 +71,17 @@ your current OS automatically and load the correct references. Compile output wi
7171

7272
### Debugging a local build
7373
Rebuilding the solution in debug mode will copy the SMAPI files into your game folder. Starting
74-
the `StardewModdingAPI` project with debugging from Visual Studio (on Mac or Windows) will launch
75-
SMAPI with the debugger attached, so you can intercept errors and step through the code being
76-
executed. This doesn't work in MonoDevelop on Linux, unfortunately.
74+
the `SMAPI` project with debugging from Visual Studio (on Mac or Windows) will launch SMAPI with
75+
the debugger attached, so you can intercept errors and step through the code being executed. This
76+
doesn't work in MonoDevelop on Linux, unfortunately.
7777

7878
### Preparing a release
7979
To prepare a crossplatform SMAPI release, you'll need to compile it on two platforms. See
8080
[crossplatforming info](https://stardewvalleywiki.com/Modding:Modder_Guide/Test_and_Troubleshoot#Testing_on_all_platforms)
8181
on the wiki for the first-time setup.
8282

83-
1. Update the version number in `GlobalAssemblyInfo.cs` and `Constants::Version`. Make sure you use a
84-
[semantic version](https://semver.org). Recommended format:
83+
1. Update the version number in `.root/build/common.targets` and `Constants::Version`. Make sure
84+
you use a [semantic version](https://semver.org). Recommended format:
8585

8686
build type | format | example
8787
:--------- | :----------------------- | :------

‎src/SMAPI.Installer/Properties/AssemblyInfo.cs‎

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

‎src/SMAPI.Installer/SMAPI.Installer.csproj‎

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

33
<PropertyGroup>
4-
<RootNamespace>SMAPI.Installer</RootNamespace>
54
<AssemblyName>SMAPI.Installer</AssemblyName>
5+
<RootNamespace>StardewModdingAPI.Installer</RootNamespace>
6+
<Description>The SMAPI installer for players.</Description>
67
<TargetFramework>net45</TargetFramework>
7-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
<LangVersion>latest</LangVersion>
99
<OutputType>Exe</OutputType>
1010
<PlatformTarget>x86</PlatformTarget>
1111
<OutputPath>$(SolutionDir)\..\bin\$(Configuration)\Installer</OutputPath>
1212
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1313
</PropertyGroup>
1414

15-
<ItemGroup>
16-
<Compile Include="..\..\build\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
17-
</ItemGroup>
18-
1915
<ItemGroup>
2016
<ProjectReference Include="..\SMAPI.Toolkit\SMAPI.Toolkit.csproj" />
2117
</ItemGroup>

‎src/SMAPI.ModBuildConfig.Analyzer.Tests/SMAPI.ModBuildConfig.Analyzer.Tests.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@
1616
<ProjectReference Include="..\SMAPI.ModBuildConfig.Analyzer\SMAPI.ModBuildConfig.Analyzer.csproj" />
1717
</ItemGroup>
1818

19+
<Import Project="..\..\build\common.targets" />
20+
1921
</Project>

‎src/SMAPI.ModBuildConfig.Analyzer/Properties/AssemblyInfo.cs‎

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

‎src/SMAPI.ModBuildConfig.Analyzer/SMAPI.ModBuildConfig.Analyzer.csproj‎

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

33
<PropertyGroup>
4+
<AssemblyName>SMAPI.ModBuildConfig.Analyzer</AssemblyName>
5+
<RootNamespace>StardewModdingAPI.ModBuildConfig.Analyzer</RootNamespace>
6+
<Version>3.0.0</Version>
47
<TargetFramework>netstandard2.0</TargetFramework>
5-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<LangVersion>latest</LangVersion>
69
<IncludeBuildOutput>false</IncludeBuildOutput>
710
<OutputPath>bin</OutputPath>
811
<LangVersion>latest</LangVersion>
912
</PropertyGroup>
1013

11-
<ItemGroup>
12-
<Compile Include="..\..\build\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
13-
</ItemGroup>
14-
1514
<ItemGroup>
1615
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.10.0" PrivateAssets="all" />
1716
<PackageReference Update="NETStandard.Library" PrivateAssets="all" />

‎src/SMAPI.ModBuildConfig/Properties/AssemblyInfo.cs‎

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

‎src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj‎

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

33
<PropertyGroup>
4-
<RootNamespace>SMAPI.ModBuildConfig</RootNamespace>
54
<AssemblyName>SMAPI.ModBuildConfig</AssemblyName>
5+
<RootNamespace>StardewModdingAPI.ModBuildConfig</RootNamespace>
6+
<Version>3.0.0</Version>
67
<TargetFramework>net45</TargetFramework>
7-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
<LangVersion>latest</LangVersion>
99
<PlatformTarget>x86</PlatformTarget>
1010
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

0 commit comments

Comments
 (0)