diff --git a/UsbSerialExampleApp/AndroidManifest.xml b/UsbSerialExampleApp/AndroidManifest.xml new file mode 100644 index 0000000..6b4998a --- /dev/null +++ b/UsbSerialExampleApp/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/UsbSerialExampleApp/Properties/AndroidManifest.xml b/UsbSerialExampleApp/Properties/AndroidManifest.xml deleted file mode 100644 index 2fc30a2..0000000 --- a/UsbSerialExampleApp/Properties/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/UsbSerialExampleApp/Properties/AssemblyInfo.cs b/UsbSerialExampleApp/Properties/AssemblyInfo.cs deleted file mode 100644 index ba38bad..0000000 --- a/UsbSerialExampleApp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Android.App; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("UsbSerialExampleApp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UsbSerialExampleApp")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/UsbSerialExampleApp/Resources/Resource.Designer.cs b/UsbSerialExampleApp/Resources/Resource.Designer.cs deleted file mode 100644 index 696074e..0000000 --- a/UsbSerialExampleApp/Resources/Resource.Designer.cs +++ /dev/null @@ -1,169 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -[assembly: global::Android.Runtime.ResourceDesignerAttribute("UsbSerialExampleApp.Resource", IsApplication=true)] - -namespace UsbSerialExampleApp -{ - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] - public partial class Resource - { - - static Resource() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - public static void UpdateIdValues() - { - global::Hoho.Android.UsbSerial.Resource.String.ApplicationName = global::UsbSerialExampleApp.Resource.String.ApplicationName; - global::Hoho.Android.UsbSerial.Resource.String.Hello = global::UsbSerialExampleApp.Resource.String.Hello; - } - - public partial class Attribute - { - - static Attribute() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Attribute() - { - } - } - - public partial class Drawable - { - - // aapt resource value: 0x7f020000 - public const int Icon = 2130837504; - - static Drawable() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Drawable() - { - } - } - - public partial class Id - { - - // aapt resource value: 0x7f060008 - public const int consoleText = 2131099656; - - // aapt resource value: 0x7f060007 - public const int demoScroller = 2131099655; - - // aapt resource value: 0x7f060001 - public const int demoTitle = 2131099649; - - // aapt resource value: 0x7f060004 - public const int deviceList = 2131099652; - - // aapt resource value: 0x7f060002 - public const int progressBar = 2131099650; - - // aapt resource value: 0x7f060000 - public const int progressBarTitle = 2131099648; - - // aapt resource value: 0x7f060003 - public const int separator = 2131099651; - - // aapt resource value: 0x7f060005 - public const int sleepButton = 2131099653; - - // aapt resource value: 0x7f060006 - public const int wakeupButton = 2131099654; - - static Id() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Id() - { - } - } - - public partial class Layout - { - - // aapt resource value: 0x7f030000 - public const int Main = 2130903040; - - // aapt resource value: 0x7f030001 - public const int serial_console = 2130903041; - - static Layout() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Layout() - { - } - } - - public partial class String - { - - // aapt resource value: 0x7f050001 - public const int ApplicationName = 2131034113; - - // aapt resource value: 0x7f050000 - public const int Hello = 2131034112; - - // aapt resource value: 0x7f050002 - public const int app_name = 2131034114; - - // aapt resource value: 0x7f050003 - public const int refreshing = 2131034115; - - // aapt resource value: 0x7f050004 - public const int sleep = 2131034116; - - // aapt resource value: 0x7f050005 - public const int wakeup = 2131034117; - - static String() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private String() - { - } - } - - public partial class Xml - { - - // aapt resource value: 0x7f040000 - public const int device_filter = 2130968576; - - static Xml() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Xml() - { - } - } - } -} -#pragma warning restore 1591 diff --git a/UsbSerialExampleApp/UsbSerialExampleApp.csproj b/UsbSerialExampleApp/UsbSerialExampleApp.csproj index 8082317..d8d2af7 100644 --- a/UsbSerialExampleApp/UsbSerialExampleApp.csproj +++ b/UsbSerialExampleApp/UsbSerialExampleApp.csproj @@ -1,99 +1,23 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {59C7DFF3-4E5E-42D7-BB77-E6C4F4E74512} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - UsbSerialExampleApp + net7.0-android + 21 + Exe + disable + disable + UsbSerialExampleApp.UsbSerialExampleApp + 1 + 1.0 UsbSerialExampleApp - 512 - true - Resources\Resource.Designer.cs - Off - False - v5.1 - Properties\AndroidManifest.xml - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - True - None + UsbSerialExampleApp - - pdbonly - true - true - true - bin\Release\ - TRACE - prompt - 4 - False - SdkOnly + + r8 + apk + - - - - - - - - - - - - - - - - - - - - Designer - - - - - Designer - - - - - - - - - - - - - - {a64567bc-548a-4cb7-9f2c-ece75ee1a868} - UsbSerialForAndroid - - - - + - - + \ No newline at end of file diff --git a/UsbSerialForAndroid/Properties/AssemblyInfo.cs b/UsbSerialForAndroid/Properties/AssemblyInfo.cs deleted file mode 100644 index 3186a29..0000000 --- a/UsbSerialForAndroid/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Android.App; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("UsbSerialForAndroid")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UsbSerialForAndroid")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.4.*")] -[assembly: AssemblyFileVersion("1.0.4.*")] diff --git a/UsbSerialForAndroid/Resources/Resource.Designer.cs b/UsbSerialForAndroid/Resources/Resource.Designer.cs deleted file mode 100644 index c278fef..0000000 --- a/UsbSerialForAndroid/Resources/Resource.Designer.cs +++ /dev/null @@ -1,59 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -[assembly: global::Android.Runtime.ResourceDesignerAttribute("Hoho.Android.UsbSerial.Resource", IsApplication=false)] - -namespace Hoho.Android.UsbSerial -{ - - - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.0.0.73")] - public partial class Resource - { - - static Resource() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - public partial class Attribute - { - - static Attribute() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Attribute() - { - } - } - - public partial class String - { - - // aapt resource value: 0x7F010000 - public static int ApplicationName = 2130771968; - - // aapt resource value: 0x7F010001 - public static int Hello = 2130771969; - - static String() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private String() - { - } - } - } -} -#pragma warning restore 1591 diff --git a/UsbSerialForAndroid/UsbSerialForAndroid.csproj b/UsbSerialForAndroid/UsbSerialForAndroid.csproj index 0ea9ded..58754e3 100644 --- a/UsbSerialForAndroid/UsbSerialForAndroid.csproj +++ b/UsbSerialForAndroid/UsbSerialForAndroid.csproj @@ -1,87 +1,10 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {A64567BC-548A-4CB7-9F2C-ECE75EE1A868} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - Hoho.Android.UsbSerial + net6.0-android;monoandroid5.0 + 21 + disable + disable Android.UsbSerial - 512 - Resources\Resource.Designer.cs - Off - False - v5.0 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + Hoho.Android.UsbSerial - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ac58c25..1adb714 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,15 +13,8 @@ variables: buildConfiguration: 'Release' outputDirectory: '$(build.binariesDirectory)/$(buildConfiguration)' -steps: -- task: NuGetToolInstaller@0 - -- task: NuGetCommand@2 - inputs: - restoreSolution: '**/*.sln' - -- task: XamarinAndroid@1 +- task: DotNetCoreCLI@2 inputs: - projectFile: '**/*droid*.csproj' - outputDirectory: '$(outputDirectory)' - configuration: '$(buildConfiguration)' + command: 'build' + projects: '**/*droid*.csproj' + arguments: '--configuration $(buildConfiguration) --output $(outputDirectory)' \ No newline at end of file