Skip to content

Commit 3e71394

Browse files
konnekonne
committed
fix AssemlyVersion duplicate issue
1 parent 055e971 commit 3e71394

File tree

2 files changed

+21
-145
lines changed

2 files changed

+21
-145
lines changed

‎src/WPFLocalizeExtension.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net452;net40;netcoreapp3.1</TargetFrameworks>
4+
<!--<TargetFrameworks>net452;net40;netcoreapp3.1</TargetFrameworks>-->
5+
<TargetFramework>net452</TargetFramework>
56
<UseWPF>True</UseWPF>
67
<AutoGenerateBindingRedirects Condition="!$(TargetFramework.StartsWith('netcore'))">true</AutoGenerateBindingRedirects>
78
<AssemblyName>WPFLocalizeExtension</AssemblyName>
8-
<Version>$(GitVersion_NuGetVersion)</Version>
9+
<!--<Version>$(GitVersion_NuGetVersion)</Version>-->
910
<AssemblyTitle>WPFLocalizeExtension</AssemblyTitle>
1011
<Authors>Bernhard Millauer,Uwe Mayer, Konrad Mattheis</Authors>
1112
<PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -36,7 +37,12 @@
3637
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
3738
<GenerateDocumentationFile>false</GenerateDocumentationFile>
3839

39-
<UnSignedFlag></UnSignedFlag>
40+
<!--Workaround AssemblyVersion Duplicate from UseWPF" -->
41+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
42+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
43+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
44+
45+
<UnSignedFlag></UnSignedFlag>
4046
</PropertyGroup>
4147

4248
<ItemGroup>
@@ -61,7 +67,7 @@
6167
<AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
6268
<PackageId>$(AssemblyName).UnSigned</PackageId>
6369
<UnSignedFlag>.UnSigned</UnSignedFlag>
64-
<!-- we can handle only one packages.lock.json so for now for unsigned just disable the usages -->
70+
<!--we can handle only one packages.lock.json so for now for unsigned just disable the usages-->
6571
<RestorePackagesWithLockFile>false</RestorePackagesWithLockFile>
6672
</PropertyGroup>
6773

@@ -76,16 +82,16 @@
7682
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
7783
</ItemGroup>
7884

79-
<ItemGroup>
80-
<PackageReference Include="XAMLMarkupExtensions$(UnSignedFlag)" Version="2.1.0" />
81-
</ItemGroup>
82-
8385
<!--PackageReference for all framworks-->
8486
<ItemGroup>
85-
<PackageReference Include="GitVersion.MsBuild" Version="5.6.11" PrivateAssets="All" />
8687
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
88+
<PackageReference Include="GitVersion.MsBuild" Version="5.7.0" PrivateAssets="all" />
8789
</ItemGroup>
8890

91+
<ItemGroup>
92+
<PackageReference Include="XAMLMarkupExtensions$(UnSignedFlag)" Version="2.0.0" />
93+
</ItemGroup>
94+
8995
<Target Name="PublishToNugetWithAPIKey" AfterTargets="GenerateNuspec">
9096
<ReadLinesFromFile Condition="Exists('$(SolutionDir)\..\..\nugetapikey.txt')" File="$(SolutionDir)\..\..\nugetapikey.txt">
9197
<Output TaskParameter="Lines" PropertyName="NugetAPIKey" />

‎src/packages.lock.json‎

Lines changed: 6 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -1,142 +1,12 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
".NETCoreApp,Version=v3.1": {
5-
"GitVersion.MsBuild": {
6-
"type": "Direct",
7-
"requested": "[5.6.11, )",
8-
"resolved": "5.6.11",
9-
"contentHash": "/shfB5WcijlhK4eHU6wnIFCltd1J1kHpqp0lLGHjtyd6dVp4Xa8la2b2jazl0SfEoyZM4tVBaQLe6vFi6stoUw=="
10-
},
11-
"Microsoft.SourceLink.GitHub": {
12-
"type": "Direct",
13-
"requested": "[1.0.0, )",
14-
"resolved": "1.0.0",
15-
"contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==",
16-
"dependencies": {
17-
"Microsoft.Build.Tasks.Git": "1.0.0",
18-
"Microsoft.SourceLink.Common": "1.0.0"
19-
}
20-
},
21-
"System.Drawing.Common": {
22-
"type": "Direct",
23-
"requested": "[4.7.0, )",
24-
"resolved": "4.7.0",
25-
"contentHash": "v+XbyYHaZjDfn0ENmJEV1VYLgGgCTx1gnfOBcppowbpOAriglYgGCvFCPr2EEZyBvXlpxbEsTwkOlInl107ahA==",
26-
"dependencies": {
27-
"Microsoft.NETCore.Platforms": "3.1.0",
28-
"Microsoft.Win32.SystemEvents": "4.7.0"
29-
}
30-
},
31-
"System.Management": {
32-
"type": "Direct",
33-
"requested": "[4.7.0, )",
34-
"resolved": "4.7.0",
35-
"contentHash": "IY+uuGhgzWiCg21i8IvQeY/Z7m1tX8VuPF+ludfn7iTCaccTtJo5HkjZbBEL8kbBubKhAKKtNXr7uMtmAc28Pw==",
36-
"dependencies": {
37-
"Microsoft.NETCore.Platforms": "3.1.0",
38-
"Microsoft.Win32.Registry": "4.7.0",
39-
"System.CodeDom": "4.7.0"
40-
}
41-
},
42-
"XAMLMarkupExtensions": {
43-
"type": "Direct",
44-
"requested": "[2.1.0, )",
45-
"resolved": "2.1.0",
46-
"contentHash": "3FKlGMp6PxB2zMjyz23xhpOGacxmIOirh70xo+AbjL5c0gYpVONJZq4dPP5ynd6TOCg30BXMSsyNEmK76yyYrg=="
47-
},
48-
"Microsoft.Build.Tasks.Git": {
49-
"type": "Transitive",
50-
"resolved": "1.0.0",
51-
"contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ=="
52-
},
53-
"Microsoft.NETCore.Platforms": {
54-
"type": "Transitive",
55-
"resolved": "3.1.0",
56-
"contentHash": "z7aeg8oHln2CuNulfhiLYxCVMPEwBl3rzicjvIX+4sUuCwvXw5oXQEtbiU2c0z4qYL5L3Kmx0mMA/+t/SbY67w=="
57-
},
58-
"Microsoft.SourceLink.Common": {
59-
"type": "Transitive",
60-
"resolved": "1.0.0",
61-
"contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg=="
62-
},
63-
"Microsoft.Win32.Registry": {
64-
"type": "Transitive",
65-
"resolved": "4.7.0",
66-
"contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==",
67-
"dependencies": {
68-
"System.Security.AccessControl": "4.7.0",
69-
"System.Security.Principal.Windows": "4.7.0"
70-
}
71-
},
72-
"Microsoft.Win32.SystemEvents": {
73-
"type": "Transitive",
74-
"resolved": "4.7.0",
75-
"contentHash": "mtVirZr++rq+XCDITMUdnETD59XoeMxSpLRIII7JRI6Yj0LEDiO1pPn0ktlnIj12Ix8bfvQqQDMMIF9wC98oCA==",
76-
"dependencies": {
77-
"Microsoft.NETCore.Platforms": "3.1.0"
78-
}
79-
},
80-
"System.CodeDom": {
81-
"type": "Transitive",
82-
"resolved": "4.7.0",
83-
"contentHash": "Hs9pw/kmvH3lXaZ1LFKj3pLQsiGfj2xo3sxSzwiLlRL6UcMZUTeCfoJ9Udalvn3yq5dLlPEZzYegrTQ1/LhPOQ=="
84-
},
85-
"System.Security.AccessControl": {
86-
"type": "Transitive",
87-
"resolved": "4.7.0",
88-
"contentHash": "JECvTt5aFF3WT3gHpfofL2MNNP6v84sxtXxpqhLBCcDRzqsPBmHhQ6shv4DwwN2tRlzsUxtb3G9M3763rbXKDg==",
89-
"dependencies": {
90-
"Microsoft.NETCore.Platforms": "3.1.0",
91-
"System.Security.Principal.Windows": "4.7.0"
92-
}
93-
},
94-
"System.Security.Principal.Windows": {
95-
"type": "Transitive",
96-
"resolved": "4.7.0",
97-
"contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ=="
98-
}
99-
},
100-
".NETFramework,Version=v4.0": {
101-
"GitVersion.MsBuild": {
102-
"type": "Direct",
103-
"requested": "[5.6.11, )",
104-
"resolved": "5.6.11",
105-
"contentHash": "/shfB5WcijlhK4eHU6wnIFCltd1J1kHpqp0lLGHjtyd6dVp4Xa8la2b2jazl0SfEoyZM4tVBaQLe6vFi6stoUw=="
106-
},
107-
"Microsoft.SourceLink.GitHub": {
108-
"type": "Direct",
109-
"requested": "[1.0.0, )",
110-
"resolved": "1.0.0",
111-
"contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==",
112-
"dependencies": {
113-
"Microsoft.Build.Tasks.Git": "1.0.0",
114-
"Microsoft.SourceLink.Common": "1.0.0"
115-
}
116-
},
117-
"XAMLMarkupExtensions": {
118-
"type": "Direct",
119-
"requested": "[2.1.0, )",
120-
"resolved": "2.1.0",
121-
"contentHash": "3FKlGMp6PxB2zMjyz23xhpOGacxmIOirh70xo+AbjL5c0gYpVONJZq4dPP5ynd6TOCg30BXMSsyNEmK76yyYrg=="
122-
},
123-
"Microsoft.Build.Tasks.Git": {
124-
"type": "Transitive",
125-
"resolved": "1.0.0",
126-
"contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ=="
127-
},
128-
"Microsoft.SourceLink.Common": {
129-
"type": "Transitive",
130-
"resolved": "1.0.0",
131-
"contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg=="
132-
}
133-
},
1344
".NETFramework,Version=v4.5.2": {
1355
"GitVersion.MsBuild": {
1366
"type": "Direct",
137-
"requested": "[5.6.11, )",
138-
"resolved": "5.6.11",
139-
"contentHash": "/shfB5WcijlhK4eHU6wnIFCltd1J1kHpqp0lLGHjtyd6dVp4Xa8la2b2jazl0SfEoyZM4tVBaQLe6vFi6stoUw=="
7+
"requested": "[5.7.0, )",
8+
"resolved": "5.7.0",
9+
"contentHash": "GkU83uopX2vjuNkVpfWdoZSPwxVJ2V6JGLbu4lfh9ucD9xKLuekYx11Ksy1lhbv4hWlrq1xZ0cH0PaPf4UOyqA=="
14010
},
14111
"Microsoft.SourceLink.GitHub": {
14212
"type": "Direct",
@@ -150,9 +20,9 @@
15020
},
15121
"XAMLMarkupExtensions": {
15222
"type": "Direct",
153-
"requested": "[2.1.0, )",
154-
"resolved": "2.1.0",
155-
"contentHash": "3FKlGMp6PxB2zMjyz23xhpOGacxmIOirh70xo+AbjL5c0gYpVONJZq4dPP5ynd6TOCg30BXMSsyNEmK76yyYrg=="
23+
"requested": "[2.0.0, )",
24+
"resolved": "2.0.0",
25+
"contentHash": "lf2OKHcoLWEmLy4WxI4D6IrAv5xCwGLMnrjTQWGPaxUYMdd9/oA4HaE7sX2QIZefruth+sJi0+nzg4dDEILPOQ=="
15626
},
15727
"Microsoft.Build.Tasks.Git": {
15828
"type": "Transitive",

0 commit comments

Comments
 (0)