Skip to content

Commit 0e91711

Browse files
committed
Remove explicit AssemblyName
Instead use project name.
1 parent 9c4aff9 commit 0e91711

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.Common.props

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,28 @@
1616
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1717
<PackageTags>unit units measurement json Json.NET Newtonsoft serialize deserialize serialization deserialization</PackageTags>
1818
</PropertyGroup>
19+
1920
<!-- Assembly and msbuild properties -->
2021
<PropertyGroup>
2122
<TargetFrameworks>netstandard1.0;net35;net40</TargetFrameworks>
22-
<AssemblyName>UnitsNet.Serialization.JsonNet</AssemblyName>
2323
<RootNamespace>UnitsNet.Serialization.JsonNet</RootNamespace>
2424
<!-- Workaround for building with dotnet CLI and targeting .NET 3.5: https://github.com/Microsoft/msbuild/issues/1333#issuecomment-296346352 -->
2525
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
2626
<OutputPath>..\Artifacts\$(MSBuildProjectName)</OutputPath>
2727
<NoWarn>CS0618</NoWarn>
2828
</PropertyGroup>
29+
2930
<!-- NuGet references that work for both signed and unsigned -->
3031
<ItemGroup>
3132
<PackageReference Include="JetBrains.Annotations" Version="10.4.0" PrivateAssets="All" />
3233
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
3334
</ItemGroup>
34-
<!-- Exclude certain files from default inclusion pattern -->
35+
36+
<!-- Exclude obj folder from default inclusion pattern -->
3537
<ItemGroup>
3638
<Compile Remove="obj\**" />
3739
<EmbeddedResource Remove="obj\**" />
3840
<None Remove="obj\**" />
3941
</ItemGroup>
42+
4043
</Project>

UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.Signed.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<DefineConstants>SIGNED</DefineConstants>
1313
<SignAssembly>true</SignAssembly>
1414
<AssemblyOriginatorKeyFile>$(MSBuildProjectDirectory)\..\UnitsNet.snk</AssemblyOriginatorKeyFile>
15-
<AssemblyName>UnitsNet.Serialization.JsonNet.Signed</AssemblyName>
1615
</PropertyGroup>
1716

1817
<!-- Signed project references, will also generate the corresponding nuget dependencies -->

UnitsNet/UnitsNet.Common.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<!-- Assembly and msbuild properties -->
2222
<PropertyGroup>
2323
<TargetFrameworks>netstandard1.0;net35;net40</TargetFrameworks>
24-
<AssemblyName>UnitsNet</AssemblyName>
2524
<RootNamespace>UnitsNet</RootNamespace>
2625
<!-- Workaround for building with dotnet CLI and targeting .NET 3.5: https://github.com/Microsoft/msbuild/issues/1333#issuecomment-296346352 -->
2726
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
@@ -33,11 +32,12 @@
3332
<PackageReference Include="JetBrains.Annotations" Version="10.4.0" PrivateAssets="All" />
3433
</ItemGroup>
3534

36-
<!-- Exclude certain files from default inclusion pattern -->
35+
<!-- Exclude obj folder from default inclusion pattern -->
3736
<ItemGroup>
3837
<Compile Remove="obj\**" />
3938
<Compile Remove="Properties\AssemblyInfo*.cs" />
4039
<EmbeddedResource Remove="obj\**" />
4140
<None Remove="obj\**" />
4241
</ItemGroup>
42+
4343
</Project>

UnitsNet/UnitsNet.Signed.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<DefineConstants>SIGNED</DefineConstants>
1313
<SignAssembly>true</SignAssembly>
1414
<AssemblyOriginatorKeyFile>$(MSBuildProjectDirectory)\..\UnitsNet.snk</AssemblyOriginatorKeyFile>
15-
<AssemblyName>UnitsNet.Signed</AssemblyName>
1615
</PropertyGroup>
1716

1817
</Project>

0 commit comments

Comments
 (0)