Skip to content

Commit

Permalink
Allineamento file di compilazione.
Browse files Browse the repository at this point in the history
  • Loading branch information
gpicchiarelli committed Feb 6, 2024
1 parent 52aa19f commit 60ea907
Show file tree
Hide file tree
Showing 38 changed files with 122 additions and 71 deletions.
Binary file modified AccordaGUItar/bin/Debug/net8.0-windows7.0/AccordaGUItar.dll
Binary file not shown.
Binary file modified AccordaGUItar/bin/Debug/net8.0-windows7.0/AccordaGUItar.exe
Binary file not shown.
Binary file modified AccordaGUItar/bin/Debug/net8.0-windows7.0/AccordaGUItar.pdb
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("AccordaGUItar")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+97944d7f26be4d0da2210b9349167247074d26ad")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8234b0b7cf8aed43f7ee4d347cadd3a7a3aec123")]
>>>>>>> 01f9ad862716b6557552d2da95db35a3ea0e0e8c
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+52aa19f4fe51a511fd61880edb96c0d35d8b9419")]
[assembly: System.Reflection.AssemblyProductAttribute("AccordaGUItar")]
[assembly: System.Reflection.AssemblyTitleAttribute("AccordaGUItar")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
<<<<<<< HEAD
481f933f9187a26a9949751df663ba97fd123adf0906de26b98b5856c4503991
=======
dcaa8bf8a8bbab77eb99a6e4f878696a2df76590c25b6f6af55ee10eba8d5139
>>>>>>> 01f9ad862716b6557552d2da95db35a3ea0e0e8c
56d9a6281887904b85883a6b49b23e3d396dcea5f3c2131141adf79921f15fb4
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = AccordaGUItar
build_property.ProjectDir = C:\Users\gpicc\source\repos\accorda\AccordaGUItar\
build_property.ProjectDir = C:\Users\Giacomo\source\repos\accorda\AccordaGUItar\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
Binary file not shown.
Binary file modified AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.baml
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d3e3a9007f87bbc6c70fe2139a1f4f338153c9efa9b1c2b3da78819695db0cec
e25ca234aea3a97aedc0e241305bcb0dba4e19d36ff116d7c5e13ea0dca9c8cf
Binary file modified AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.dll
Binary file not shown.
47 changes: 31 additions & 16 deletions AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.g.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#pragma checksum "..\..\..\AccordaGUItar.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "80420517AD0E00B2C1BA060AFD1430FBC7A5ED27"
#pragma checksum "..\..\..\AccordaGUItar.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "901949210350DD6CFD9CEC55AD18CC11344049C2"
//------------------------------------------------------------------------------
// <auto-generated>
// Il codice è stato generato da uno strumento.
// Versione runtime:4.0.30319.42000
// This code was generated by a tool.
//
// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se
// il codice viene rigenerato.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

Expand Down Expand Up @@ -42,31 +41,31 @@ namespace Accorda {
public partial class AccordaGUI : MahApps.Metro.Controls.MetroWindow, System.Windows.Markup.IComponentConnector {


#line 15 "..\..\..\AccordaGUItar.xaml"
#line 30 "..\..\..\AccordaGUItar.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox InputDevices;

#line default
#line hidden


#line 28 "..\..\..\AccordaGUItar.xaml"
#line 43 "..\..\..\AccordaGUItar.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock FrequenzaLabel;

#line default
#line hidden


#line 29 "..\..\..\AccordaGUItar.xaml"
#line 44 "..\..\..\AccordaGUItar.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock FrequenzaAttuale;

#line default
#line hidden


#line 34 "..\..\..\AccordaGUItar.xaml"
#line 49 "..\..\..\AccordaGUItar.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ComboBox SelezionaCorda;

Expand All @@ -79,7 +78,7 @@ public partial class AccordaGUI : MahApps.Metro.Controls.MetroWindow, System.Win
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.0.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.1.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
Expand All @@ -95,7 +94,7 @@ public void InitializeComponent() {
}

[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.0.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.1.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
Expand All @@ -104,24 +103,40 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
switch (connectionId)
{
case 1:

#line 24 "..\..\..\AccordaGUItar.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.LeggiLicenza_Click);

#line default
#line hidden
return;
case 2:

#line 25 "..\..\..\AccordaGUItar.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Chiudi_Click);

#line default
#line hidden
return;
case 3:
this.InputDevices = ((System.Windows.Controls.ComboBox)(target));

#line 15 "..\..\..\AccordaGUItar.xaml"
#line 30 "..\..\..\AccordaGUItar.xaml"
this.InputDevices.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.InputDevices_SelectionChanged);

#line default
#line hidden
return;
case 2:
case 4:
this.FrequenzaLabel = ((System.Windows.Controls.TextBlock)(target));
return;
case 3:
case 5:
this.FrequenzaAttuale = ((System.Windows.Controls.TextBlock)(target));
return;
case 4:
case 6:
this.SelezionaCorda = ((System.Windows.Controls.ComboBox)(target));

#line 34 "..\..\..\AccordaGUItar.xaml"
#line 49 "..\..\..\AccordaGUItar.xaml"
this.SelezionaCorda.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelezionaCorda_SelectionChanged);

#line default
Expand Down
Binary file modified AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.g.resources
Binary file not shown.
Binary file modified AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.pdb
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"documents":{"C:\\Users\\Giacomo\\source\\repos\\accorda\\*":"https://raw.githubusercontent.com/gpicchiarelli/accorda/c3f409dd82ba80f5c8bff65f4ea00803cb9dfed0/*"}}
{"documents":{"C:\\Users\\Giacomo\\source\\repos\\accorda\\*":"https://raw.githubusercontent.com/gpicchiarelli/accorda/52aa19f4fe51a511fd61880edb96c0d35d8b9419/*"}}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ C:\Users\Giacomo\source\repos\accorda\AccordaGUItar\App.xaml
1-1812784380

6791824736
218426520093
218-1432647240
AccordaGUItar.xaml;

False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,17 @@
winexe
C#
.cs
C:\Users\gpicc\source\repos\accorda\AccordaGUItar\obj\Debug\net8.0-windows7.0\
C:\Users\Giacomo\source\repos\accorda\AccordaGUItar\obj\Debug\net8.0-windows7.0\
AccordaGUItar
none
false
TRACE;DEBUG;NET;NET8_0;NETCOREAPP
C:\Users\gpicc\source\repos\accorda\AccordaGUItar\App.xaml
C:\Users\Giacomo\source\repos\accorda\AccordaGUItar\App.xaml
1-1812784380

8-1335952047
<<<<<<< HEAD
218187268512
=======
218-1432647240
>>>>>>> 97944d7f26be4d0da2210b9349167247074d26ad
AccordaGUItar.xaml;

False
True

Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@

<<<<<<< HEAD
FC:\Users\gpicc\source\repos\accorda\AccordaGUItar\App.xaml;;
=======
FC:\Users\Giacomo\source\repos\accorda\AccordaGUItar\App.xaml;;
>>>>>>> 97944d7f26be4d0da2210b9349167247074d26ad

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

using System;
using System.Reflection;

[assembly: System.Reflection.AssemblyCompanyAttribute("AccordaGUItar")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+52aa19f4fe51a511fd61880edb96c0d35d8b9419")]
[assembly: System.Reflection.AssemblyProductAttribute("AccordaGUItar")]
[assembly: System.Reflection.AssemblyTitleAttribute("AccordaGUItar")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]

// Generato dalla classe WriteCodeFragment di MSBuild.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
56d9a6281887904b85883a6b49b23e3d396dcea5f3c2131141adf79921f15fb4
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
is_global = true
build_property.TargetFramework = net8.0-windows7.0
build_property.TargetPlatformMinVersion = 7.0
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = AccordaGUItar_ehjpmkqc_wpftmp
build_property.ProjectDir = C:\Users\Giacomo\source\repos\accorda\AccordaGUItar\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"documents":{"C:\\Users\\Giacomo\\source\\repos\\accorda\\*":"https://raw.githubusercontent.com/gpicchiarelli/accorda/52aa19f4fe51a511fd61880edb96c0d35d8b9419/*"}}
11 changes: 5 additions & 6 deletions AccordaGUItar/obj/Debug/net8.0-windows7.0/App.g.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6890181222E7A3B7BB557A0AEE2A6D94F0690A8E"
//------------------------------------------------------------------------------
// <auto-generated>
// Il codice è stato generato da uno strumento.
// Versione runtime:4.0.30319.42000
// This code was generated by a tool.
//
// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se
// il codice viene rigenerato.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

Expand Down Expand Up @@ -47,7 +46,7 @@ public partial class App : System.Windows.Application {
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.0.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.1.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
Expand All @@ -73,7 +72,7 @@ public void InitializeComponent() {
/// </summary>
[System.STAThreadAttribute()]
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.0.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.1.0")]
public static void Main() {
AccordaGUItar.App app = new AccordaGUItar.App();
app.InitializeComponent();
Expand Down
2 changes: 1 addition & 1 deletion AccordaGUItar/obj/Debug/net8.0-windows7.0/App.g.i.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9D93C5DB3FA77968BDA7E1E14F12D4BF74377CFD"
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6890181222E7A3B7BB557A0AEE2A6D94F0690A8E"
//------------------------------------------------------------------------------
// <auto-generated>
// Il codice è stato generato da uno strumento.
Expand Down
Binary file modified AccordaGUItar/obj/Debug/net8.0-windows7.0/apphost.exe
Binary file not shown.
Binary file modified AccordaGUItar/obj/Debug/net8.0-windows7.0/ref/AccordaGUItar.dll
Binary file not shown.
Binary file not shown.
10 changes: 9 additions & 1 deletion AccordaGUItar/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -816,5 +816,13 @@
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.101/PortableRuntimeIdentifierGraph.json"
}
}
}
},
"logs": [
{
"code": "Undefined",
"level": "Warning",
"warningLevel": 1,
"message": "Si è verificato un problema durante la lettura del file di cache C:\\Users\\Giacomo\\source\\repos\\accorda\\AccordaGUItar\\obj\\project.nuget.cache: Invalid property identifier character: <. Path 'version', line 3, position 0."
}
]
}
13 changes: 8 additions & 5 deletions AccordaGUItar/obj/project.nuget.cache
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"version": 2,
<<<<<<< HEAD
"dgSpecHash": "xluSHpvtHjGik/7sJUGPVpPtnFtVeX8KtrixkWfhFrh8OEN7x3oNv1ovFe1ACsRPCfuYIZNfo6IBD2zsSajKbA==",
=======
"dgSpecHash": "nVuFMlWtLC+BAoAldXm+0R4MtV9yrYfaeL4w0qck6IvRrJOUB1+xIXs26Nz/aiJCzhlBqs5y5KBLDR/N9iIjWA==",
>>>>>>> 97944d7f26be4d0da2210b9349167247074d26ad
"success": true,
"projectFilePath": "C:\\Users\\Giacomo\\source\\repos\\accorda\\AccordaGUItar\\AccordaGUItar.csproj",
"expectedPackageFiles": [
Expand All @@ -26,5 +22,12 @@
"C:\\Users\\Giacomo\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512",
"C:\\Users\\Giacomo\\.nuget\\packages\\system.text.json\\4.7.2\\system.text.json.4.7.2.nupkg.sha512"
],
"logs": []
"logs": [
{
"code": "Undefined",
"level": "Warning",
"warningLevel": 1,
"message": "Si è verificato un problema durante la lettura del file di cache C:\\Users\\Giacomo\\source\\repos\\accorda\\AccordaGUItar\\obj\\project.nuget.cache: Invalid property identifier character: <. Path 'version', line 3, position 0."
}
]
}
Binary file modified accorda.net/.vs/Accorda/v17/.suo
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("Accorda")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+97944d7f26be4d0da2210b9349167247074d26ad")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8234b0b7cf8aed43f7ee4d347cadd3a7a3aec123")]
>>>>>>> 01f9ad862716b6557552d2da95db35a3ea0e0e8c
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+52aa19f4fe51a511fd61880edb96c0d35d8b9419")]
[assembly: System.Reflection.AssemblyProductAttribute("Accorda")]
[assembly: System.Reflection.AssemblyTitleAttribute("Accorda")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
<<<<<<< HEAD
68668204ac7feb54c7463f3d3613259d64dc7a58f1fb6d581f9acf883a22f0e1
=======
194dfe9904e1fd2448b0cb1d4f79ae3fc4e5a10cd2cd6c3eef1d2af4cc5a4ebf
>>>>>>> 01f9ad862716b6557552d2da95db35a3ea0e0e8c
be643ddde8748bafac31b3bdb04b22069455d94460ddafe45c3019b96e84cf8c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Accorda
build_property.ProjectDir = C:\Users\gpicc\source\repos\accorda\accorda.net\
build_property.ProjectDir = C:\Users\Giacomo\source\repos\accorda\accorda.net\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
Binary file modified accorda.net/obj/Debug/net8.0-windows7.0/Accorda.assets.cache
Binary file not shown.
Binary file not shown.
10 changes: 9 additions & 1 deletion accorda.net/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -597,5 +597,13 @@
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.101/PortableRuntimeIdentifierGraph.json"
}
}
}
},
"logs": [
{
"code": "Undefined",
"level": "Warning",
"warningLevel": 1,
"message": "Si è verificato un problema durante la lettura del file di cache C:\\Users\\Giacomo\\source\\repos\\accorda\\accorda.net\\obj\\project.nuget.cache: Invalid property identifier character: <. Path 'version', line 3, position 0."
}
]
}
13 changes: 8 additions & 5 deletions accorda.net/obj/project.nuget.cache
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"version": 2,
<<<<<<< HEAD
"dgSpecHash": "KKGBiebaeH2MAKW6HEI40I8kySxn8UeTZI3ldOR7zKPpwZ8cl6otNElUDxLsjFlE9tB/FHE6l/am+CDNncp+IQ==",
=======
"dgSpecHash": "776M7A8f8vYXlKeWkFTNUe9STV175YMOsTrYYolBnvwUefocd/1AS/JsNHCF5R2ACShyDzUU93PGORbApQKFWQ==",
>>>>>>> 97944d7f26be4d0da2210b9349167247074d26ad
"success": true,
"projectFilePath": "C:\\Users\\Giacomo\\source\\repos\\accorda\\accorda.net\\Accorda.csproj",
"expectedPackageFiles": [
Expand All @@ -21,5 +17,12 @@
"C:\\Users\\Giacomo\\.nuget\\packages\\system.security.accesscontrol\\4.7.0\\system.security.accesscontrol.4.7.0.nupkg.sha512",
"C:\\Users\\Giacomo\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512"
],
"logs": []
"logs": [
{
"code": "Undefined",
"level": "Warning",
"warningLevel": 1,
"message": "Si è verificato un problema durante la lettura del file di cache C:\\Users\\Giacomo\\source\\repos\\accorda\\accorda.net\\obj\\project.nuget.cache: Invalid property identifier character: <. Path 'version', line 3, position 0."
}
]
}

0 comments on commit 60ea907

Please sign in to comment.