diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index e8defda96eae9034f30a08bedb3904a555abae26..b9f99baa77c453868822875e5b210b25db5ff26d 100644
Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ
diff --git "a/.vs/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271 (5)/v16/.suo" "b/.vs/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271 (5)/v16/.suo"
new file mode 100644
index 0000000000000000000000000000000000000000..2757c3801ab6db046f83e4ed09694113dfc7fce9
Binary files /dev/null and "b/.vs/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271 (5)/v16/.suo" differ
diff --git a/Pairingproject2.3.sln b/Pairingproject2.3.sln
index ff5bd499a0b0877a44c058312c73dc6ffc8fe22e..63524eaf0fc6afacb920d68c6a1f3da8a43d7c49 100644
--- a/Pairingproject2.3.sln
+++ b/Pairingproject2.3.sln
@@ -3,18 +3,70 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29806.167
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pairingproject2.3", "Pairingproject2.3\Pairingproject2.3.csproj", "{FD388512-3555-4B90-B36A-5D686E473089}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pairingproject2.3", "Pairingproject2.3\Pairingproject2.3.csproj", "{FD388512-3555-4B90-B36A-5D686E473089}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "uwpnice", "..\uwpnice\uwpnice.csproj", "{582801A8-B6D3-4E94-985F-FC0B8E7881C9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|ARM = Debug|ARM
+ Debug|ARM64 = Debug|ARM64
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
+ Release|ARM = Release|ARM
+ Release|ARM64 = Release|ARM64
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FD388512-3555-4B90-B36A-5D686E473089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD388512-3555-4B90-B36A-5D686E473089}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Debug|ARM.Build.0 = Debug|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Debug|ARM64.Build.0 = Debug|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Debug|x64.Build.0 = Debug|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Debug|x86.Build.0 = Debug|Any CPU
{FD388512-3555-4B90-B36A-5D686E473089}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD388512-3555-4B90-B36A-5D686E473089}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Release|ARM.ActiveCfg = Release|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Release|ARM.Build.0 = Release|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Release|ARM64.Build.0 = Release|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Release|x64.ActiveCfg = Release|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Release|x64.Build.0 = Release|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Release|x86.ActiveCfg = Release|Any CPU
+ {FD388512-3555-4B90-B36A-5D686E473089}.Release|x86.Build.0 = Release|Any CPU
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Debug|ARM.ActiveCfg = Debug|ARM
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Debug|ARM.Build.0 = Debug|ARM
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Debug|ARM.Deploy.0 = Debug|ARM
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Debug|ARM64.Build.0 = Debug|ARM64
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Debug|ARM64.Deploy.0 = Debug|ARM64
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Debug|x64.ActiveCfg = Debug|x64
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Debug|x64.Build.0 = Debug|x64
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Debug|x64.Deploy.0 = Debug|x64
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Debug|x86.ActiveCfg = Debug|x86
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Debug|x86.Build.0 = Debug|x86
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Debug|x86.Deploy.0 = Debug|x86
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Release|Any CPU.ActiveCfg = Release|x86
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Release|ARM.ActiveCfg = Release|ARM
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Release|ARM.Build.0 = Release|ARM
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Release|ARM.Deploy.0 = Release|ARM
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Release|ARM64.ActiveCfg = Release|ARM64
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Release|ARM64.Build.0 = Release|ARM64
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Release|ARM64.Deploy.0 = Release|ARM64
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Release|x64.ActiveCfg = Release|x64
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Release|x64.Build.0 = Release|x64
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Release|x64.Deploy.0 = Release|x64
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Release|x86.ActiveCfg = Release|x86
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Release|x86.Build.0 = Release|x86
+ {582801A8-B6D3-4E94-985F-FC0B8E7881C9}.Release|x86.Deploy.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Pairingproject2.3/obj/Pairingproject2.3.csproj.nuget.dgspec.json b/Pairingproject2.3/obj/Pairingproject2.3.csproj.nuget.dgspec.json
index 5ec0a2ff4755e7949495e39f8bc994b3359d3017..b4a58288933c84df8129a996ccb6624179be3dce 100644
--- a/Pairingproject2.3/obj/Pairingproject2.3.csproj.nuget.dgspec.json
+++ b/Pairingproject2.3/obj/Pairingproject2.3.csproj.nuget.dgspec.json
@@ -1,6 +1,7 @@
{
"format": 1,
"restore": {
+<<<<<<< Updated upstream
"C:\\Users\\ASUS\\Desktop\\新建文件夹\\Pairingproject2.3\\Pairingproject2.3.csproj": {}
},
"projects": {
@@ -12,22 +13,30 @@
"projectPath": "C:\\Users\\ASUS\\Desktop\\新建文件夹\\Pairingproject2.3\\Pairingproject2.3.csproj",
"packagesPath": "C:\\Users\\ASUS\\.nuget\\packages\\",
"outputPath": "C:\\Users\\ASUS\\Desktop\\新建文件夹\\Pairingproject2.3\\obj\\",
+=======
+ "C:\\Users\\wly good\\Desktop\\新建文件夹 (5)\\Pairingproject2.3\\Pairingproject2.3.csproj": {}
+ },
+ "projects": {
+ "C:\\Users\\wly good\\Desktop\\新建文件夹 (5)\\Pairingproject2.3\\Pairingproject2.3.csproj": {
+ "version": "1.0.0",
+ "restore": {
+ "projectUniqueName": "C:\\Users\\wly good\\Desktop\\新建文件夹 (5)\\Pairingproject2.3\\Pairingproject2.3.csproj",
+ "projectName": "Pairingproject2.3",
+ "projectPath": "C:\\Users\\wly good\\Desktop\\新建文件夹 (5)\\Pairingproject2.3\\Pairingproject2.3.csproj",
+ "packagesPath": "C:\\Users\\wly good\\.nuget\\packages\\",
+ "outputPath": "C:\\Users\\wly good\\Desktop\\新建文件夹 (5)\\Pairingproject2.3\\obj\\",
+>>>>>>> Stashed changes
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Microsoft\\Xamarin\\NuGet\\"
- ],
"configFilePaths": [
- "C:\\Users\\ASUS\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
+ "C:\\Users\\wly good\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netcoreapp3.1"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "C:\\Users\\ASUS\\Documents\\Visual Studio 2019": {},
- "https://www.nuget.org/api/v2/": {}
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.1": {
diff --git a/Pairingproject2.3/obj/Pairingproject2.3.csproj.nuget.g.props b/Pairingproject2.3/obj/Pairingproject2.3.csproj.nuget.g.props
index 5c8468b62f0ce5cfedbe0222e676c5c15598e607..40295b95ca7ac64d248df9e4d81edd58574199af 100644
--- a/Pairingproject2.3/obj/Pairingproject2.3.csproj.nuget.g.props
+++ b/Pairingproject2.3/obj/Pairingproject2.3.csproj.nuget.g.props
@@ -5,7 +5,7 @@
NuGet
$(MSBuildThisFileDirectory)project.assets.json
$(UserProfile)\.nuget\packages\
- C:\Users\ASUS\.nuget\packages\;C:\Microsoft\Xamarin\NuGet\
+ C:\Users\wly good\.nuget\packages\
PackageReference
5.5.0
diff --git a/Pairingproject2.3/obj/Release/netcoreapp3.1/Pairingproject2.3.csprojAssemblyReference.cache b/Pairingproject2.3/obj/Release/netcoreapp3.1/Pairingproject2.3.csprojAssemblyReference.cache
new file mode 100644
index 0000000000000000000000000000000000000000..74fe67b1ca671095970d4a7fbcae2417231e8f41
Binary files /dev/null and b/Pairingproject2.3/obj/Release/netcoreapp3.1/Pairingproject2.3.csprojAssemblyReference.cache differ
diff --git a/Pairingproject2.3/obj/project.assets.json b/Pairingproject2.3/obj/project.assets.json
index ea591505f7546e69ce3e2194984b446a6d77b6a5..a1f0684f110f886b1b457fc5e93a60fa95466de7 100644
--- a/Pairingproject2.3/obj/project.assets.json
+++ b/Pairingproject2.3/obj/project.assets.json
@@ -8,33 +8,27 @@
".NETCoreApp,Version=v3.1": []
},
"packageFolders": {
- "C:\\Users\\ASUS\\.nuget\\packages\\": {},
- "C:\\Microsoft\\Xamarin\\NuGet\\": {}
+ "C:\\Users\\wly good\\.nuget\\packages\\": {}
},
"project": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "C:\\Users\\ASUS\\Desktop\\新建文件夹\\Pairingproject2.3\\Pairingproject2.3.csproj",
+ "projectUniqueName": "C:\\Users\\ASUS\\Desktop\\项目协同\\Pairingproject2.3\\Pairingproject2.3.csproj",
"projectName": "Pairingproject2.3",
- "projectPath": "C:\\Users\\ASUS\\Desktop\\新建文件夹\\Pairingproject2.3\\Pairingproject2.3.csproj",
+ "projectPath": "C:\\Users\\ASUS\\Desktop\\项目协同\\Pairingproject2.3\\Pairingproject2.3.csproj",
"packagesPath": "C:\\Users\\ASUS\\.nuget\\packages\\",
- "outputPath": "C:\\Users\\ASUS\\Desktop\\新建文件夹\\Pairingproject2.3\\obj\\",
+ "outputPath": "C:\\Users\\ASUS\\Desktop\\项目协同\\Pairingproject2.3\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Microsoft\\Xamarin\\NuGet\\"
- ],
"configFilePaths": [
- "C:\\Users\\ASUS\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
+ "C:\\Users\\wly good\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netcoreapp3.1"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "C:\\Users\\ASUS\\Documents\\Visual Studio 2019": {},
- "https://www.nuget.org/api/v2/": {}
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.1": {
diff --git a/Pairingproject2.3/obj/project.nuget.cache b/Pairingproject2.3/obj/project.nuget.cache
index 87d796ef22b2b6fa8c418c5987b5106914d40296..417d10c552db99626b2fa287277c309977d7adaa 100644
--- a/Pairingproject2.3/obj/project.nuget.cache
+++ b/Pairingproject2.3/obj/project.nuget.cache
@@ -1,8 +1,14 @@
{
"version": 2,
+<<<<<<< Updated upstream
"dgSpecHash": "UFOAOaa97/GtSDxDSEGuGX3dFLEiXVf+4WcA09lGb4NACqMz7EmeTl3/zK5EHHlip9AK6Lh3Wo7fkMKXcD33lg==",
"success": true,
"projectFilePath": "C:\\Users\\ASUS\\Desktop\\新建文件夹\\Pairingproject2.3\\Pairingproject2.3.csproj",
+=======
+ "dgSpecHash": "46UvVMkIlkNpuXbL6BdMVBkCpX9tbdplmDqdl+uDCdzCjzZ5Hk86xv5OWTcst0+lX4XupZuPouy9gAE05VeCtQ==",
+ "success": true,
+ "projectFilePath": "C:\\Users\\wly good\\Desktop\\新建文件夹 (5)\\Pairingproject2.3\\Pairingproject2.3.csproj",
+>>>>>>> Stashed changes
"expectedPackageFiles": [],
"logs": []
}
\ No newline at end of file