Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backend.NetStandard: remove project #219

Merged
merged 1 commit into from
Aug 9, 2023
Merged

Backend.NetStandard: remove project #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gwallet-legacy.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Backend", "src\GWallet.Backend\GWallet.Backend-legacy.fsproj", "{96F9B3E5-11F8-4F5F-AADC-51D0D995B3D2}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Backend.Legacy", "src\GWallet.Backend\GWallet.Backend-legacy.fsproj", "{96F9B3E5-11F8-4F5F-AADC-51D0D995B3D2}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aarani I only have 1 single issue with this PR and it's this ^ , what is GWallet.Backend.Legacy? I dont think that's the name of the assembly or the project (please fix this not only here, there are 2 occurrences or more)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is the project name in solution, you can't have the same name for two projects in the same solution (VS breaks), so one had to be changed. This name doesn't really do anything as far as I know the Assembly name is specified in the fsproj file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is the project name in solution, you can't have the same name for two projects in the same solution (VS breaks), so one had to be changed. This name doesn't really do anything as far as I know the Assembly name is specified in the fsproj file.

@knocte

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aarani ok please include this info in the commit msg (and re-run the broken CI)

EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Backend.Tests", "src\GWallet.Backend.Tests\GWallet.Backend.Tests-legacy.fsproj", "{F9448076-88BE-4045-8704-A652D133E036}"
EndProject
Expand All @@ -24,7 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{9DFD61F8
scripts\bump.fsx = scripts\bump.fsx
EndProjectSection
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "GWallet.Backend.NetStandard", "src\GWallet.Backend.NetStandard\GWallet.Backend.NetStandard.fsproj", "{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "GWallet.Backend", "src\GWallet.Backend\GWallet.Backend.fsproj", "{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Frontend.XF.Mac", "src\GWallet.Frontend.XF.Mac\GWallet.Frontend.XF.Mac.fsproj", "{9E020D62-9160-49AC-A9CD-476CADAE0B87}"
EndProject
Expand Down
4 changes: 2 additions & 2 deletions gwallet.linux-legacy.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Backend.NetStandard", "src\GWallet.Backend.NetStandard\GWallet.Backend.NetStandard.fsproj", "{949A9225-A1BE-4EDA-A1DA-04AC131CFE9B}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Backend", "src\GWallet.Backend\GWallet.Backend.fsproj", "{949A9225-A1BE-4EDA-A1DA-04AC131CFE9B}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Frontend.XF", "src\GWallet.Frontend.XF\GWallet.Frontend.XF.fsproj", "{2C7A1A49-CAD1-4961-866A-D32868AE7D18}"
EndProject
Expand All @@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{3703CCD5
scripts\replace.fsx = scripts\replace.fsx
EndProjectSection
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Backend", "src\GWallet.Backend\GWallet.Backend-legacy.fsproj", "{96F9B3E5-11F8-4F5F-AADC-51D0D995B3D2}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Backend.Legacy`", "src\GWallet.Backend\GWallet.Backend-legacy.fsproj", "{96F9B3E5-11F8-4F5F-AADC-51D0D995B3D2}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Backend.Tests", "src\GWallet.Backend.Tests\GWallet.Backend.Tests-legacy.fsproj", "{F9448076-88BE-4045-8704-A652D133E036}"
EndProject
Expand Down
4 changes: 2 additions & 2 deletions gwallet.mac-legacy.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Backend.NetStandard", "src\GWallet.Backend.NetStandard\GWallet.Backend.NetStandard.fsproj", "{949A9225-A1BE-4EDA-A1DA-04AC131CFE9B}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Backend", "src\GWallet.Backend\GWallet.Backend.fsproj", "{949A9225-A1BE-4EDA-A1DA-04AC131CFE9B}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Frontend.XF", "src\GWallet.Frontend.XF\GWallet.Frontend.XF.fsproj", "{2C7A1A49-CAD1-4961-866A-D32868AE7D18}"
EndProject
Expand All @@ -19,7 +19,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Frontend.XF.iOS", "
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Frontend.XF.Android", "src\GWallet.Frontend.XF.Android\GWallet.Frontend.XF.Android.fsproj", "{24B7E0C6-9113-4430-8614-6E3AED7FE0C0}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Backend", "src\GWallet.Backend\GWallet.Backend-legacy.fsproj", "{96F9B3E5-11F8-4F5F-AADC-51D0D995B3D2}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Backend.Legacy", "src\GWallet.Backend\GWallet.Backend-legacy.fsproj", "{96F9B3E5-11F8-4F5F-AADC-51D0D995B3D2}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Backend.Tests", "src\GWallet.Backend.Tests\GWallet.Backend.Tests-legacy.fsproj", "{F9448076-88BE-4045-8704-A652D133E036}"
EndProject
Expand Down
26 changes: 0 additions & 26 deletions gwallet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{9DFD61F8
scripts\bump.fsx = scripts\bump.fsx
EndProjectSection
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "GWallet.Backend.NetStandard", "src\GWallet.Backend.NetStandard\GWallet.Backend.NetStandard.fsproj", "{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Frontend.XF.Mac", "src\GWallet.Frontend.XF.Mac\GWallet.Frontend.XF.Mac.fsproj", "{9E020D62-9160-49AC-A9CD-476CADAE0B87}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GWallet.Frontend.XF.UWP", "src\GWallet.Frontend.XF.UWP\GWallet.Frontend.XF.UWP.csproj", "{DD7B4A7D-02E7-4DF7-9894-25743BDEC0C0}"
Expand Down Expand Up @@ -142,30 +140,6 @@ Global
{8413EEF5-69F5-499F-AE01-754E9541EF90}.Release|x64.Build.0 = Release|Any CPU
{8413EEF5-69F5-499F-AE01-754E9541EF90}.Release|x86.ActiveCfg = Release|Any CPU
{8413EEF5-69F5-499F-AE01-754E9541EF90}.Release|x86.Build.0 = Release|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Debug|ARM.ActiveCfg = Debug|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Debug|ARM.Build.0 = Debug|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Debug|iPhone.Build.0 = Debug|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Debug|x64.ActiveCfg = Debug|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Debug|x64.Build.0 = Debug|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Debug|x86.ActiveCfg = Debug|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Debug|x86.Build.0 = Debug|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Release|Any CPU.Build.0 = Release|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Release|ARM.ActiveCfg = Release|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Release|ARM.Build.0 = Release|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Release|iPhone.ActiveCfg = Release|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Release|iPhone.Build.0 = Release|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Release|x64.ActiveCfg = Release|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Release|x64.Build.0 = Release|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Release|x86.ActiveCfg = Release|Any CPU
{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}.Release|x86.Build.0 = Release|Any CPU
{9E020D62-9160-49AC-A9CD-476CADAE0B87}.Debug|Any CPU.ActiveCfg = Debug|iPhone
{9E020D62-9160-49AC-A9CD-476CADAE0B87}.Debug|Any CPU.Build.0 = Debug|iPhone
{9E020D62-9160-49AC-A9CD-476CADAE0B87}.Debug|ARM.ActiveCfg = Debug|iPhone
Expand Down
1 change: 0 additions & 1 deletion scripts/bump.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ let filesToBumpMiniVersion: seq<string> =
let filesToBumpFullVersion: seq<string> =
Seq.append filesToBumpMiniVersion [
"src/GWallet.Backend/GWallet.Backend.fsproj"
"src/GWallet.Backend.NetStandard/GWallet.Backend.NetStandard.fsproj"
"src/GWallet.Backend/Properties/CommonAssemblyInfo.fs"
"snap/snapcraft.yaml"
"src/GWallet.Frontend.XF.UWP/Package.appxmanifest"
Expand Down
153 changes: 0 additions & 153 deletions src/GWallet.Backend.NetStandard/GWallet.Backend.NetStandard.fsproj
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/GWallet.Backend/GWallet.Backend.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
<Folder Include="Ether\" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.7.0" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aarani what is this? if it's not a mistake it probably needs to be explained in commit msg too

<PackageReference Include="Fsdk" Version="0.6.0--date20230530-1155.git-3bb8d08" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2">
<GeneratePathProperty></GeneratePathProperty>
Expand Down
5 changes: 2 additions & 3 deletions src/GWallet.Frontend.XF.Android/GWallet.Frontend.XF.Android.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,9 +506,8 @@
<Project>{85236682-6463-4209-B66C-E0643EF12B46}</Project>
<Name>GWallet.Frontend.XF</Name>
</ProjectReference>
<ProjectReference Include="..\GWallet.Backend.NetStandard\GWallet.Backend.NetStandard.fsproj">
<Project>{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}</Project>
<Name>GWallet.Backend.NetStandard</Name>
<ProjectReference Include="..\GWallet.Backend\GWallet.Backend.fsproj">
<Name>GWallet.Backend</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
Expand Down
5 changes: 2 additions & 3 deletions src/GWallet.Frontend.XF.Gtk/GWallet.Frontend.XF.Gtk.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,8 @@
<Project>{85236682-6463-4209-B66C-E0643EF12B46}</Project>
<Name>GWallet.Frontend.XF</Name>
</ProjectReference>
<ProjectReference Include="..\GWallet.Backend.NetStandard\GWallet.Backend.NetStandard.fsproj">
<Project>{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}</Project>
<Name>GWallet.Backend.NetStandard</Name>
<ProjectReference Include="..\GWallet.Backend\GWallet.Backend.fsproj">
<Name>GWallet.Backend</Name>
</ProjectReference>
<None Include="webkit-sharp.dll.config" />
</ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions src/GWallet.Frontend.XF.Mac/GWallet.Frontend.XF.Mac.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,8 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\GWallet.Backend.NetStandard\GWallet.Backend.NetStandard.fsproj">
<Project>{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}</Project>
<Name>GWallet.Backend.NetStandard</Name>
<ProjectReference Include="..\GWallet.Backend\GWallet.Backend.fsproj">
<Name>GWallet.Backend</Name>
</ProjectReference>
<ProjectReference Include="..\GWallet.Frontend.XF\GWallet.Frontend.XF.fsproj">
<Project>{85236682-6463-4209-B66C-E0643EF12B46}</Project>
Expand Down
5 changes: 2 additions & 3 deletions src/GWallet.Frontend.XF.iOS/GWallet.Frontend.XF.iOS.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,8 @@
<Project>{85236682-6463-4209-B66C-E0643EF12B46}</Project>
<Name>GWallet.Frontend.XF</Name>
</ProjectReference>
<ProjectReference Include="..\GWallet.Backend.NetStandard\GWallet.Backend.NetStandard.fsproj">
<Project>{D1D192E0-F226-40AD-8D81-687F7E6F7DAB}</Project>
<Name>GWallet.Backend.NetStandard</Name>
<ProjectReference Include="..\GWallet.Backend\GWallet.Backend.fsproj">
<Name>GWallet.Backend</Name>
</ProjectReference>
<Reference Include="FSharp.Data">
<HintPath>..\..\packages\FSharp.Data.3.0.0\lib\netstandard2.0\FSharp.Data.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/GWallet.Frontend.XF/GWallet.Frontend.XF.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<ProjectReference Include="..\GWallet.Backend.NetStandard\GWallet.Backend.NetStandard.fsproj" />
<ProjectReference Include="..\GWallet.Backend\GWallet.Backend.fsproj" />
<PackageReference Update="FSharp.Core" Version="4.7.0" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
Expand Down
Loading