Merge vas-working to master (attempt 2) #2

Merged
BobdaFett merged 28 commits from vas-working into master 2023-11-23 00:05:09 +00:00
2 changed files with 38 additions and 0 deletions
Showing only changes of commit ba7e12e51b - Show all commits

No files matched your search

+1
View File
@@ -1 +1,2 @@
/PcgsInvUi/bin/
/PcgsInvUi/obj/
+37
View File
@@ -23,4 +23,41 @@
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
<Content Include="obj\Debug\net6.0\apphost.exe" />
<Content Include="obj\Debug\net6.0\Avalonia\original.dll" />
<Content Include="obj\Debug\net6.0\Avalonia\original.pdb" />
<Content Include="obj\Debug\net6.0\Avalonia\original.ref.dll" />
<Content Include="obj\Debug\net6.0\Avalonia\references" />
<Content Include="obj\Debug\net6.0\Avalonia\resources" />
<Content Include="obj\Debug\net6.0\Avalonia\Resources.Inputs.cache" />
<Content Include="obj\Debug\net6.0\PcgsInvUi.AssemblyInfoInputs.cache" />
<Content Include="obj\Debug\net6.0\PcgsInvUi.assets.cache" />
<Content Include="obj\Debug\net6.0\PcgsInvUi.csproj.AssemblyReference.cache" />
<Content Include="obj\Debug\net6.0\PcgsInvUi.csproj.CopyComplete" />
<Content Include="obj\Debug\net6.0\PcgsInvUi.csproj.CoreCompileInputs.cache" />
<Content Include="obj\Debug\net6.0\PcgsInvUi.csproj.FileListAbsolute.txt" />
<Content Include="obj\Debug\net6.0\PcgsInvUi.dll" />
<Content Include="obj\Debug\net6.0\PcgsInvUi.GeneratedMSBuildEditorConfig.editorconfig" />
<Content Include="obj\Debug\net6.0\PcgsInvUi.genruntimeconfig.cache" />
<Content Include="obj\Debug\net6.0\PcgsInvUi.pdb" />
<Content Include="obj\Debug\net6.0\refint\PcgsInvUi.dll" />
<Content Include="obj\Debug\net6.0\ref\PcgsInvUi.dll" />
<Content Include="obj\PcgsInvUi.csproj.nuget.dgspec.json" />
<Content Include="obj\PcgsInvUi.csproj.nuget.g.props" />
<Content Include="obj\PcgsInvUi.csproj.nuget.g.targets" />
<Content Include="obj\project.assets.json" />
<Content Include="obj\project.nuget.cache" />
<Content Include="obj\project.packagespec.json" />
<Content Include="obj\rider.project.model.nuget.info" />
<Content Include="obj\rider.project.restore.info" />
</ItemGroup>
<ItemGroup>
<Compile Include="obj\Debug\net6.0\.NETCoreApp,Version=v6.0.AssemblyAttributes.cs" />
<Compile Include="obj\Debug\net6.0\PcgsInvUi.AssemblyInfo.cs" />
</ItemGroup>
</Project>