Skip to content

Commit 926b971

Browse files
orichesoriches
authored
Merge pull request #17 from Siliconrob/master
Align project resource references to standard format
2 parents 73b618d + ee62261 commit 926b971

File tree

4 files changed

+38
-90
lines changed

4 files changed

+38
-90
lines changed

‎src/Faker.Net.5.0/Faker.Net.5.0.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
<ItemGroup>
6666
<Folder Include="Extensions\" />
6767
<Folder Include="Helpers\" />
68-
<Folder Include="Resources\" />
6968
</ItemGroup>
7069

7170
</Project>

‎src/Faker.Net.Core.3.0/Faker.Net.Core.3.0.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
<ItemGroup>
6868
<Folder Include="Extensions\" />
6969
<Folder Include="Helpers\" />
70-
<Folder Include="Resources\" />
7170
</ItemGroup>
7271

7372
</Project>

‎src/Faker.Net.Standard.2.0/Faker.Net.Standard.2.0.csproj

Lines changed: 19 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313

1414
<ItemGroup>
1515
<Compile Include="..\Faker\Address.cs" Link="Address.cs" />
16+
<Compile Include="..\Faker\Boolean.cs" Link="Boolean.cs" />
1617
<Compile Include="..\Faker\Company.cs" Link="Company.cs" />
1718
<Compile Include="..\Faker\Config.cs" Link="Config.cs" />
1819
<Compile Include="..\Faker\Country.cs" Link="Country.cs" />
1920
<Compile Include="..\Faker\Currency.cs" Link="Currency.cs" />
21+
<Compile Include="..\Faker\Enum.cs" Link="Enum.cs" />
2022
<Compile Include="..\Faker\Extensions\ArrayExtensions.cs" Link="Extensions\ArrayExtensions.cs" />
2123
<Compile Include="..\Faker\Extensions\EnumerableExtensions.cs" Link="Extensions\EnumerableExtensions.cs" />
2224
<Compile Include="..\Faker\Extensions\StringExtensions.cs" Link="Extensions\StringExtensions.cs" />
@@ -40,56 +42,29 @@
4042
</ItemGroup>
4143

4244
<ItemGroup>
43-
<Folder Include="Extensions\" />
44-
<Folder Include="Extensions\" />
45-
<Folder Include="Helpers\" />
46-
<Folder Include="Resources\" />
47-
<Folder Include="Resources\" />
48-
</ItemGroup>
49-
50-
<ItemGroup>
51-
<EmbeddedResource Include="..\Faker\Resources\Address.de-DE.resx" Link="Resources\Address.de-DE.resx">
52-
<Generator>ResXFileCodeGenerator</Generator>
53-
</EmbeddedResource>
54-
<EmbeddedResource Include="..\Faker\Resources\Address.resx" Link="Resources\Address.resx">
55-
<Generator>ResXFileCodeGenerator</Generator>
56-
</EmbeddedResource>
57-
<EmbeddedResource Include="..\Faker\Resources\Company.de-DE.resx" Link="Resources\Company.de-DE.resx">
58-
<Generator>ResXFileCodeGenerator</Generator>
59-
</EmbeddedResource>
60-
<EmbeddedResource Include="..\Faker\Resources\Company.resx" Link="Resources\Company.resx">
61-
<Generator>ResXFileCodeGenerator</Generator>
62-
</EmbeddedResource>
45+
<EmbeddedResource Include="..\Faker\Resources\Address.de-DE.resx" Link="Resources\Address.de-DE.resx" />
46+
<EmbeddedResource Include="..\Faker\Resources\Address.resx" Link="Resources\Address.resx" />
47+
<EmbeddedResource Include="..\Faker\Resources\Company.de-DE.resx" Link="Resources\Company.de-DE.resx" />
48+
<EmbeddedResource Include="..\Faker\Resources\Company.resx" Link="Resources\Company.resx" />
6349
<EmbeddedResource Include="..\Faker\Resources\Country.de-DE.resx" Link="Resources\Country.de-DE.resx" />
6450
<EmbeddedResource Include="..\Faker\Resources\Country.resx" Link="Resources\Country.resx" />
6551
<EmbeddedResource Include="..\Faker\Resources\Currency.de-DE.resx" Link="Resources\Currency.de-DE.resx" />
6652
<EmbeddedResource Include="..\Faker\Resources\Currency.resx" Link="Resources\Currency.resx" />
6753
<EmbeddedResource Include="..\Faker\Resources\Identification.de-DE.resx" Link="Resources\Identification.de-DE.resx" />
6854
<EmbeddedResource Include="..\Faker\Resources\Identification.resx" Link="Resources\Identification.resx" />
69-
<EmbeddedResource Include="..\Faker\Resources\Internet.de-DE.resx" Link="Resources\Internet.de-DE.resx">
70-
<Generator>ResXFileCodeGenerator</Generator>
71-
</EmbeddedResource>
72-
<EmbeddedResource Include="..\Faker\Resources\Internet.resx" Link="Resources\Internet.resx">
73-
<Generator>ResXFileCodeGenerator</Generator>
74-
</EmbeddedResource>
75-
<EmbeddedResource Include="..\Faker\Resources\Lorem.de-DE.resx" Link="Resources\Lorem.de-DE.resx">
76-
<Generator>ResXFileCodeGenerator</Generator>
77-
</EmbeddedResource>
78-
<EmbeddedResource Include="..\Faker\Resources\Lorem.resx" Link="Resources\Lorem.resx">
79-
<Generator>ResXFileCodeGenerator</Generator>
80-
</EmbeddedResource>
81-
<EmbeddedResource Include="..\Faker\Resources\Name.de-DE.resx" Link="Resources\Name.de-DE.resx">
82-
<Generator>ResXFileCodeGenerator</Generator>
83-
</EmbeddedResource>
84-
<EmbeddedResource Include="..\Faker\Resources\Name.resx" Link="Resources\Name.resx">
85-
<Generator>ResXFileCodeGenerator</Generator>
86-
</EmbeddedResource>
87-
<EmbeddedResource Include="..\Faker\Resources\Phone.de-DE.resx" Link="Resources\Phone.de-DE.resx">
88-
<Generator>ResXFileCodeGenerator</Generator>
89-
</EmbeddedResource>
90-
<EmbeddedResource Include="..\Faker\Resources\Phone.resx" Link="Resources\Phone.resx">
91-
<Generator>ResXFileCodeGenerator</Generator>
92-
</EmbeddedResource>
55+
<EmbeddedResource Include="..\Faker\Resources\Internet.de-DE.resx" Link="Resources\Internet.de-DE.resx" />
56+
<EmbeddedResource Include="..\Faker\Resources\Internet.resx" Link="Resources\Internet.resx" />
57+
<EmbeddedResource Include="..\Faker\Resources\Lorem.de-DE.resx" Link="Resources\Lorem.de-DE.resx" />
58+
<EmbeddedResource Include="..\Faker\Resources\Lorem.resx" Link="Resources\Lorem.resx" />
59+
<EmbeddedResource Include="..\Faker\Resources\Name.de-DE.resx" Link="Resources\Name.de-DE.resx" />
60+
<EmbeddedResource Include="..\Faker\Resources\Name.resx" Link="Resources\Name.resx" />
61+
<EmbeddedResource Include="..\Faker\Resources\Phone.de-DE.resx" Link="Resources\Phone.de-DE.resx" />
62+
<EmbeddedResource Include="..\Faker\Resources\Phone.resx" Link="Resources\Phone.resx" />
9363
</ItemGroup>
9464

65+
<ItemGroup>
66+
<Folder Include="Extensions\" />
67+
<Folder Include="Helpers\" />
68+
</ItemGroup>
69+
9570
</Project>

‎src/Faker.Net.Standard.2.1/Faker.Net.Standard.2.1.csproj

Lines changed: 19 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313

1414
<ItemGroup>
1515
<Compile Include="..\Faker\Address.cs" Link="Address.cs" />
16+
<Compile Include="..\Faker\Boolean.cs" Link="Boolean.cs" />
1617
<Compile Include="..\Faker\Company.cs" Link="Company.cs" />
1718
<Compile Include="..\Faker\Config.cs" Link="Config.cs" />
1819
<Compile Include="..\Faker\Country.cs" Link="Country.cs" />
1920
<Compile Include="..\Faker\Currency.cs" Link="Currency.cs" />
21+
<Compile Include="..\Faker\Enum.cs" Link="Enum.cs" />
2022
<Compile Include="..\Faker\Extensions\ArrayExtensions.cs" Link="Extensions\ArrayExtensions.cs" />
2123
<Compile Include="..\Faker\Extensions\EnumerableExtensions.cs" Link="Extensions\EnumerableExtensions.cs" />
2224
<Compile Include="..\Faker\Extensions\StringExtensions.cs" Link="Extensions\StringExtensions.cs" />
@@ -40,56 +42,29 @@
4042
</ItemGroup>
4143

4244
<ItemGroup>
43-
<Folder Include="Extensions\" />
44-
<Folder Include="Extensions\" />
45-
<Folder Include="Helpers\" />
46-
<Folder Include="Resources\" />
47-
<Folder Include="Resources\" />
48-
</ItemGroup>
49-
50-
<ItemGroup>
51-
<EmbeddedResource Include="..\Faker\Resources\Address.de-DE.resx" Link="Resources\Address.de-DE.resx">
52-
<Generator>ResXFileCodeGenerator</Generator>
53-
</EmbeddedResource>
54-
<EmbeddedResource Include="..\Faker\Resources\Address.resx" Link="Resources\Address.resx">
55-
<Generator>ResXFileCodeGenerator</Generator>
56-
</EmbeddedResource>
57-
<EmbeddedResource Include="..\Faker\Resources\Company.de-DE.resx" Link="Resources\Company.de-DE.resx">
58-
<Generator>ResXFileCodeGenerator</Generator>
59-
</EmbeddedResource>
60-
<EmbeddedResource Include="..\Faker\Resources\Company.resx" Link="Resources\Company.resx">
61-
<Generator>ResXFileCodeGenerator</Generator>
62-
</EmbeddedResource>
45+
<EmbeddedResource Include="..\Faker\Resources\Address.de-DE.resx" Link="Resources\Address.de-DE.resx" />
46+
<EmbeddedResource Include="..\Faker\Resources\Address.resx" Link="Resources\Address.resx" />
47+
<EmbeddedResource Include="..\Faker\Resources\Company.de-DE.resx" Link="Resources\Company.de-DE.resx" />
48+
<EmbeddedResource Include="..\Faker\Resources\Company.resx" Link="Resources\Company.resx" />
6349
<EmbeddedResource Include="..\Faker\Resources\Country.de-DE.resx" Link="Resources\Country.de-DE.resx" />
6450
<EmbeddedResource Include="..\Faker\Resources\Country.resx" Link="Resources\Country.resx" />
6551
<EmbeddedResource Include="..\Faker\Resources\Currency.de-DE.resx" Link="Resources\Currency.de-DE.resx" />
6652
<EmbeddedResource Include="..\Faker\Resources\Currency.resx" Link="Resources\Currency.resx" />
6753
<EmbeddedResource Include="..\Faker\Resources\Identification.de-DE.resx" Link="Resources\Identification.de-DE.resx" />
6854
<EmbeddedResource Include="..\Faker\Resources\Identification.resx" Link="Resources\Identification.resx" />
69-
<EmbeddedResource Include="..\Faker\Resources\Internet.de-DE.resx" Link="Resources\Internet.de-DE.resx">
70-
<Generator>ResXFileCodeGenerator</Generator>
71-
</EmbeddedResource>
72-
<EmbeddedResource Include="..\Faker\Resources\Internet.resx" Link="Resources\Internet.resx">
73-
<Generator>ResXFileCodeGenerator</Generator>
74-
</EmbeddedResource>
75-
<EmbeddedResource Include="..\Faker\Resources\Lorem.de-DE.resx" Link="Resources\Lorem.de-DE.resx">
76-
<Generator>ResXFileCodeGenerator</Generator>
77-
</EmbeddedResource>
78-
<EmbeddedResource Include="..\Faker\Resources\Lorem.resx" Link="Resources\Lorem.resx">
79-
<Generator>ResXFileCodeGenerator</Generator>
80-
</EmbeddedResource>
81-
<EmbeddedResource Include="..\Faker\Resources\Name.de-DE.resx" Link="Resources\Name.de-DE.resx">
82-
<Generator>ResXFileCodeGenerator</Generator>
83-
</EmbeddedResource>
84-
<EmbeddedResource Include="..\Faker\Resources\Name.resx" Link="Resources\Name.resx">
85-
<Generator>ResXFileCodeGenerator</Generator>
86-
</EmbeddedResource>
87-
<EmbeddedResource Include="..\Faker\Resources\Phone.de-DE.resx" Link="Resources\Phone.de-DE.resx">
88-
<Generator>ResXFileCodeGenerator</Generator>
89-
</EmbeddedResource>
90-
<EmbeddedResource Include="..\Faker\Resources\Phone.resx" Link="Resources\Phone.resx">
91-
<Generator>ResXFileCodeGenerator</Generator>
92-
</EmbeddedResource>
55+
<EmbeddedResource Include="..\Faker\Resources\Internet.de-DE.resx" Link="Resources\Internet.de-DE.resx" />
56+
<EmbeddedResource Include="..\Faker\Resources\Internet.resx" Link="Resources\Internet.resx" />
57+
<EmbeddedResource Include="..\Faker\Resources\Lorem.de-DE.resx" Link="Resources\Lorem.de-DE.resx" />
58+
<EmbeddedResource Include="..\Faker\Resources\Lorem.resx" Link="Resources\Lorem.resx" />
59+
<EmbeddedResource Include="..\Faker\Resources\Name.de-DE.resx" Link="Resources\Name.de-DE.resx" />
60+
<EmbeddedResource Include="..\Faker\Resources\Name.resx" Link="Resources\Name.resx" />
61+
<EmbeddedResource Include="..\Faker\Resources\Phone.de-DE.resx" Link="Resources\Phone.de-DE.resx" />
62+
<EmbeddedResource Include="..\Faker\Resources\Phone.resx" Link="Resources\Phone.resx" />
63+
</ItemGroup>
64+
65+
<ItemGroup>
66+
<Folder Include="Extensions\" />
67+
<Folder Include="Helpers\" />
9368
</ItemGroup>
9469

9570
</Project>

0 commit comments

Comments
 (0)