diff --git a/EOLib.Config/EOLib.Config.csproj b/EOLib.Config/EOLib.Config.csproj index 8f136ff2a..5554d71fa 100644 --- a/EOLib.Config/EOLib.Config.csproj +++ b/EOLib.Config/EOLib.Config.csproj @@ -1,9 +1,10 @@  + netstandard2.0 Library - false ..\bin\$(Configuration)\lib\ + Library for interacting with Endless Online configuration files $(DefineConstants);LINUX diff --git a/EOLib.Config/Properties/AssemblyInfo.cs b/EOLib.Config/Properties/AssemblyInfo.cs deleted file mode 100644 index 12cfb1328..000000000 --- a/EOLib.Config/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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("EOLib.Config")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("EOLib.Config")] -[assembly: AssemblyCopyright("Copyright © Ethan Moffat 2014-2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("827dae5c-1e14-4f85-9346-9534f82af899")] - -// 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/EOLib.Graphics/EOLib.Graphics.csproj b/EOLib.Graphics/EOLib.Graphics.csproj index f7f8fc1ef..cc4f8c2c9 100644 --- a/EOLib.Graphics/EOLib.Graphics.csproj +++ b/EOLib.Graphics/EOLib.Graphics.csproj @@ -1,9 +1,10 @@  + net6.0 Library - false ..\bin\$(Configuration)\lib\ + Library for interacting with Endless Online gfx files $(DefineConstants);LINUX diff --git a/EOLib.Graphics/Properties/AssemblyInfo.cs b/EOLib.Graphics/Properties/AssemblyInfo.cs deleted file mode 100644 index 00bb0406c..000000000 --- a/EOLib.Graphics/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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("EOLib.Graphics")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("EOLib.Graphics")] -[assembly: AssemblyCopyright("Copyright © Ethan Moffat 2014-2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d7b3635e-e39f-4062-8698-9e7ba24db03e")] - -// 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/EOLib.IO/EOLib.IO.csproj b/EOLib.IO/EOLib.IO.csproj index 8f136ff2a..62f69d7ca 100644 --- a/EOLib.IO/EOLib.IO.csproj +++ b/EOLib.IO/EOLib.IO.csproj @@ -1,9 +1,10 @@  + netstandard2.0 Library - false ..\bin\$(Configuration)\lib\ + Library for interacting with Endless Online pub and map files $(DefineConstants);LINUX diff --git a/EOLib.IO/Properties/AssemblyInfo.cs b/EOLib.IO/Properties/AssemblyInfo.cs deleted file mode 100644 index 1fbfac8ba..000000000 --- a/EOLib.IO/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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("EOLib.IO")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("EOLib.IO")] -[assembly: AssemblyCopyright("Copyright © Ethan Moffat 2014-2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("9987febc-877f-4f43-8453-e004888a7363")] - -// 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/EOLib.Localization/EOLib.Localization.csproj b/EOLib.Localization/EOLib.Localization.csproj index 851de98ca..ed17f07eb 100644 --- a/EOLib.Localization/EOLib.Localization.csproj +++ b/EOLib.Localization/EOLib.Localization.csproj @@ -1,9 +1,10 @@  + netstandard2.0 Library - false ..\bin\$(Configuration)\lib\ + Library for interacting with Endless Online edf files $(DefineConstants);LINUX diff --git a/EOLib.Localization/Properties/AssemblyInfo.cs b/EOLib.Localization/Properties/AssemblyInfo.cs deleted file mode 100644 index d30a15fae..000000000 --- a/EOLib.Localization/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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("EOLib.Localization")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("EOLib.Localization")] -[assembly: AssemblyCopyright("Copyright © Ethan Moffat 2014-2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("97de7ffa-eea7-4a64-a34c-784addaf6679")] - -// 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/EOLib.Logger/EOLib.Logger.csproj b/EOLib.Logger/EOLib.Logger.csproj index fe6d446ff..b230245f8 100644 --- a/EOLib.Logger/EOLib.Logger.csproj +++ b/EOLib.Logger/EOLib.Logger.csproj @@ -1,9 +1,10 @@  + netstandard2.0 Library - false ..\bin\$(Configuration)\lib\ + Library for interacting with Endless Online log files $(DefineConstants);LINUX diff --git a/EOLib.Logger/Properties/AssemblyInfo.cs b/EOLib.Logger/Properties/AssemblyInfo.cs deleted file mode 100644 index ddaae41b5..000000000 --- a/EOLib.Logger/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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("EOLib.Logger")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("EOLib.Logger")] -[assembly: AssemblyCopyright("Copyright © Ethan Moffat 2014-2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("635e25b9-8889-48e7-9d18-0d34c446db50")] - -// 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/EOLib/EOLib.csproj b/EOLib/EOLib.csproj index a40d7f863..520398fc5 100644 --- a/EOLib/EOLib.csproj +++ b/EOLib/EOLib.csproj @@ -1,9 +1,10 @@  + netstandard2.0 Library - false ..\bin\$(Configuration)\lib\ + Base library for Endless Online development $(DefineConstants);LINUX diff --git a/EOLib/Properties/AssemblyInfo.cs b/EOLib/Properties/AssemblyInfo.cs deleted file mode 100644 index 271ae3585..000000000 --- a/EOLib/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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("EOLib")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("EOLib")] -[assembly: AssemblyCopyright("Copyright © Ethan Moffat 2014-2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("2d9d7ff1-cd70-4f8c-9ab7-934892179565")] - -// 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/azure-pipelines.yml b/azure-pipelines.yml index 7076f18e0..fc7f5af21 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,4 +1,4 @@ -name: 0.4.$(rev:rrr) +name: 0.5.$(rev:rrr) trigger: - master @@ -41,7 +41,44 @@ steps: displayName: 'Install .Net 6 runtime/sdk' inputs: version: 6.0.x - +- task: Assembly-Info-NetCore@3 + displayName: 'Set assembly version and copyright info' + inputs: + Path: '$(Build.SourcesDirectory)' + FileNames: '**/*.csproj' + InsertAttributes: true + FileEncoding: 'auto' + WriteBOM: false + GenerateDocumentationFile: 'false' + Authors: 'Ethan Moffat' + Copyright: 'Copyright © 2014-2022 Ethan Moffat' + VersionNumber: '$(Build.BuildNumber)' + FileVersionNumber: '$(Build.BuildNumber)' + InformationalVersion: '$(Build.BuildNumber)' + LogLevel: 'verbose' + FailOnWarning: false + DisableTelemetry: false +- task: Assembly-Info-NetCore@3 + displayName: 'Set nuget package properties' + inputs: + Path: '$(Build.SourcesDirectory)' + FileNames: | + **/EOLib*.csproj + !**/EOLib.*Test.csproj + InsertAttributes: true + FileEncoding: 'auto' + WriteBOM: false + GeneratePackageOnBuild: 'true' + PackageRequireLicenseAcceptance: 'false' + PackageLicenseExpression: 'MIT' + PackageProjectUrl: 'https://github.com/ethanmoffat/EndlessClient' + RepositoryUrl: 'https://github.com/ethanmoffat/EndlessClient' + RepositoryType: 'git' + PackageTags: 'endless-online eo' + PackageVersion: '$(Build.BuildNumber)' + LogLevel: 'verbose' + FailOnWarning: false + DisableTelemetry: false - task: DotNetCoreCLI@2 displayName: 'dotnet restore' inputs: @@ -71,19 +108,30 @@ steps: displayName: 'ZIP EndlessClient' inputs: rootFolderOrFile: $(Build.SourcesDirectory)/bin/$(buildConfiguration)/client/$(dropDir)/ - archiveFile: $(Build.ArtifactStagingDirectory)/EndlessClient.$(friendlyPlatform).zip + archiveFile: $(Build.ArtifactStagingDirectory)/zip/EndlessClient.$(friendlyPlatform).zip - task: ArchiveFiles@2 displayName: 'ZIP EOBot' inputs: rootFolderOrFile: $(Build.SourcesDirectory)/bin/$(buildConfiguration)/utils/EOBot/net6.0/ - archiveFile: $(Build.ArtifactStagingDirectory)/EOBot.$(friendlyPlatform).zip - + archiveFile: $(Build.ArtifactStagingDirectory)/zip/EOBot.$(friendlyPlatform).zip - task: PublishBuildArtifacts@1 displayName: 'Publish Artifacts' inputs: - PathtoPublish: $(Build.ArtifactStagingDirectory) + PathtoPublish: $(Build.ArtifactStagingDirectory)/zip ArtifactName: EndlessClient +- task: CopyFiles@2 + displayName: 'Copy nuget packages' + inputs: + SourceFolder: '$(Build.SourcesDirectory)/bin/$(buildConfiguration)/' + Contents: '**/*.nupkg' + TargetFolder: '$(Build.ArtifactStagingDirectory)/nuget' +- task: PublishBuildArtifacts@1 + displayName: 'Publish nuget Artifacts' + inputs: + PathtoPublish: $(Build.ArtifactStagingDirectory)/nuget + ArtifactName: nuget.$(friendlyPlatform) + - script: | git tag build/$(Build.BuildNumber) git push origin build/$(Build.BuildNumber) diff --git a/common.targets b/common.targets new file mode 100644 index 000000000..5e45c1c1a --- /dev/null +++ b/common.targets @@ -0,0 +1,5 @@ + + + 1591 + + \ No newline at end of file