From 1a5c309c7f1338db49afd3b06761678dd116c99f Mon Sep 17 00:00:00 2001 From: Ethan Moffat Date: Wed, 9 Mar 2022 22:39:35 -0800 Subject: [PATCH 01/10] Add Assembly-Info-NetCore task to set assembly/package versions to build number --- azure-pipelines.yml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7076f18e0..3e18041ba 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -41,7 +41,30 @@ steps: displayName: 'Install .Net 6 runtime/sdk' inputs: version: 6.0.x - +- task: Assembly-Info-NetCore@3 + inputs: + Path: '$(Build.SourcesDirectory)' + FileNames: '**/*.csproj' + InsertAttributes: true + FileEncoding: 'auto' + WriteBOM: false + GenerateDocumentationFile: 'true' + GeneratePackageOnBuild: 'true' + PackageRequireLicenseAcceptance: 'false' + Authors: 'Ethan Moffat' + Copyright: 'Copyright © 2014-2022 Ethan Moffat' + PackageLicenseExpression: 'MIT' + PackageProjectUrl: 'https://github.com/ethanmoffat/EndlessClient' + RepositoryUrl: 'https://github.com/ethanmoffat/EndlessClient' + RepositoryType: 'git' + PackageTags: 'endless-online eo' + VersionNumber: '$(Build.BuildNumber)' + FileVersionNumber: '$(Build.BuildNumber)' + InformationalVersion: '$(Build.BuildNumber)' + PackageVersion: '$(Build.BuildNumber)' + LogLevel: 'verbose' + FailOnWarning: false + DisableTelemetry: false - task: DotNetCoreCLI@2 displayName: 'dotnet restore' inputs: @@ -53,6 +76,7 @@ steps: sudo apt-get install -y ttf-mscorefonts-installer && sudo fc-cache -f displayName: 'Linux - install windows fonts' condition: eq(variables['friendlyPlatform'], 'Linux') +- task: Assembly-Info-NetCore@3 - task: DotNetCoreCLI@2 displayName: 'dotnet build' inputs: From 57956c68cd1138c5982522181ce284a38b5ac848 Mon Sep 17 00:00:00 2001 From: Ethan Moffat Date: Wed, 9 Mar 2022 22:50:12 -0800 Subject: [PATCH 02/10] Update pipeline to only set assembly info/packaging for EOLib.* projects (excluding tests) --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3e18041ba..b08723e5c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -44,7 +44,7 @@ steps: - task: Assembly-Info-NetCore@3 inputs: Path: '$(Build.SourcesDirectory)' - FileNames: '**/*.csproj' + FileNames: '**/EOLib*!(Test).csproj' InsertAttributes: true FileEncoding: 'auto' WriteBOM: false From d24ad238cc1660b9edcdf5f21995acc39f3ce2ff Mon Sep 17 00:00:00 2001 From: Ethan Moffat Date: Wed, 9 Mar 2022 22:50:37 -0800 Subject: [PATCH 03/10] Set description for each EOLib package and remove AssemblyInfo --- EOLib.Config/EOLib.Config.csproj | 2 +- EOLib.Config/Properties/AssemblyInfo.cs | 35 ------------------- EOLib.Graphics/EOLib.Graphics.csproj | 2 +- EOLib.Graphics/Properties/AssemblyInfo.cs | 35 ------------------- EOLib.IO/EOLib.IO.csproj | 2 +- EOLib.IO/Properties/AssemblyInfo.cs | 35 ------------------- EOLib.Localization/EOLib.Localization.csproj | 2 +- EOLib.Localization/Properties/AssemblyInfo.cs | 35 ------------------- EOLib.Logger/EOLib.Logger.csproj | 2 +- EOLib.Logger/Properties/AssemblyInfo.cs | 35 ------------------- EOLib/EOLib.csproj | 2 +- EOLib/Properties/AssemblyInfo.cs | 35 ------------------- 12 files changed, 6 insertions(+), 216 deletions(-) delete mode 100644 EOLib.Config/Properties/AssemblyInfo.cs delete mode 100644 EOLib.Graphics/Properties/AssemblyInfo.cs delete mode 100644 EOLib.IO/Properties/AssemblyInfo.cs delete mode 100644 EOLib.Localization/Properties/AssemblyInfo.cs delete mode 100644 EOLib.Logger/Properties/AssemblyInfo.cs delete mode 100644 EOLib/Properties/AssemblyInfo.cs diff --git a/EOLib.Config/EOLib.Config.csproj b/EOLib.Config/EOLib.Config.csproj index 8f136ff2a..412a7bb9f 100644 --- a/EOLib.Config/EOLib.Config.csproj +++ b/EOLib.Config/EOLib.Config.csproj @@ -2,8 +2,8 @@ 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..7ce53bfe4 100644 --- a/EOLib.Graphics/EOLib.Graphics.csproj +++ b/EOLib.Graphics/EOLib.Graphics.csproj @@ -2,8 +2,8 @@ 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..49f506e9f 100644 --- a/EOLib.IO/EOLib.IO.csproj +++ b/EOLib.IO/EOLib.IO.csproj @@ -2,8 +2,8 @@ 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..e223f665c 100644 --- a/EOLib.Localization/EOLib.Localization.csproj +++ b/EOLib.Localization/EOLib.Localization.csproj @@ -2,8 +2,8 @@ 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..b1b8461d6 100644 --- a/EOLib.Logger/EOLib.Logger.csproj +++ b/EOLib.Logger/EOLib.Logger.csproj @@ -2,8 +2,8 @@ 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..0a6683cf7 100644 --- a/EOLib/EOLib.csproj +++ b/EOLib/EOLib.csproj @@ -2,8 +2,8 @@ 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")] From 5967b782b3b63470d0533565db4146d2a55c24e4 Mon Sep 17 00:00:00 2001 From: Ethan Moffat Date: Wed, 9 Mar 2022 23:04:53 -0800 Subject: [PATCH 04/10] Set assembly version for all assemblies. Create packages for only EOLib.* projects (excluding tests). Copy/publish nuget packages --- azure-pipelines.yml | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b08723e5c..8555fd67b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,25 +42,35 @@ steps: inputs: version: 6.0.x - task: Assembly-Info-NetCore@3 + displayName: 'Set assembly version and copyright info' inputs: Path: '$(Build.SourcesDirectory)' - FileNames: '**/EOLib*!(Test).csproj' + FileNames: '**' InsertAttributes: true FileEncoding: 'auto' WriteBOM: false GenerateDocumentationFile: 'true' - GeneratePackageOnBuild: 'true' - PackageRequireLicenseAcceptance: '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*!(Test).csproj' + InsertAttributes: true + GeneratePackageOnBuild: 'true' + PackageRequireLicenseAcceptance: 'false' PackageLicenseExpression: 'MIT' PackageProjectUrl: 'https://github.com/ethanmoffat/EndlessClient' RepositoryUrl: 'https://github.com/ethanmoffat/EndlessClient' RepositoryType: 'git' PackageTags: 'endless-online eo' - VersionNumber: '$(Build.BuildNumber)' - FileVersionNumber: '$(Build.BuildNumber)' - InformationalVersion: '$(Build.BuildNumber)' PackageVersion: '$(Build.BuildNumber)' LogLevel: 'verbose' FailOnWarning: false @@ -95,19 +105,29 @@ 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)/**/*.nupkg + TargetFolder: $(Build.ArtifactStagingDirectory)/nuget +- task: PublishBuildArtifacts@1 + displayName: 'Publish nuget Artifacts' + inputs: + PathtoPublish: $(Build.ArtifactStagingDirectory)/nuget + ArtifactName: nuget + - script: | git tag build/$(Build.BuildNumber) git push origin build/$(Build.BuildNumber) From 191cdf0a938dec4337bc70681a3ea46a8da2777f Mon Sep 17 00:00:00 2001 From: Ethan Moffat Date: Wed, 9 Mar 2022 23:27:24 -0800 Subject: [PATCH 05/10] Suppress warnings for missing XML doc comments --- EOLib.Config/EOLib.Config.csproj | 1 + EOLib.Graphics/EOLib.Graphics.csproj | 1 + EOLib.IO/EOLib.IO.csproj | 1 + EOLib.Localization/EOLib.Localization.csproj | 1 + EOLib.Logger/EOLib.Logger.csproj | 1 + EOLib/EOLib.csproj | 1 + common.targets | 5 +++++ 7 files changed, 11 insertions(+) create mode 100644 common.targets diff --git a/EOLib.Config/EOLib.Config.csproj b/EOLib.Config/EOLib.Config.csproj index 412a7bb9f..5554d71fa 100644 --- a/EOLib.Config/EOLib.Config.csproj +++ b/EOLib.Config/EOLib.Config.csproj @@ -1,4 +1,5 @@  + netstandard2.0 Library diff --git a/EOLib.Graphics/EOLib.Graphics.csproj b/EOLib.Graphics/EOLib.Graphics.csproj index 7ce53bfe4..cc4f8c2c9 100644 --- a/EOLib.Graphics/EOLib.Graphics.csproj +++ b/EOLib.Graphics/EOLib.Graphics.csproj @@ -1,4 +1,5 @@  + net6.0 Library diff --git a/EOLib.IO/EOLib.IO.csproj b/EOLib.IO/EOLib.IO.csproj index 49f506e9f..62f69d7ca 100644 --- a/EOLib.IO/EOLib.IO.csproj +++ b/EOLib.IO/EOLib.IO.csproj @@ -1,4 +1,5 @@  + netstandard2.0 Library diff --git a/EOLib.Localization/EOLib.Localization.csproj b/EOLib.Localization/EOLib.Localization.csproj index e223f665c..ed17f07eb 100644 --- a/EOLib.Localization/EOLib.Localization.csproj +++ b/EOLib.Localization/EOLib.Localization.csproj @@ -1,4 +1,5 @@  + netstandard2.0 Library diff --git a/EOLib.Logger/EOLib.Logger.csproj b/EOLib.Logger/EOLib.Logger.csproj index b1b8461d6..b230245f8 100644 --- a/EOLib.Logger/EOLib.Logger.csproj +++ b/EOLib.Logger/EOLib.Logger.csproj @@ -1,4 +1,5 @@  + netstandard2.0 Library diff --git a/EOLib/EOLib.csproj b/EOLib/EOLib.csproj index 0a6683cf7..520398fc5 100644 --- a/EOLib/EOLib.csproj +++ b/EOLib/EOLib.csproj @@ -1,4 +1,5 @@  + netstandard2.0 Library 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 From f84df2725c311bf0207a9fa4e4a9f36466203f47 Mon Sep 17 00:00:00 2001 From: Ethan Moffat Date: Wed, 9 Mar 2022 23:32:54 -0800 Subject: [PATCH 06/10] Fix filename filter when setting assembly versions Remove empty assembly info task --- azure-pipelines.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8555fd67b..07180e10b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -45,7 +45,7 @@ steps: displayName: 'Set assembly version and copyright info' inputs: Path: '$(Build.SourcesDirectory)' - FileNames: '**' + FileNames: '**/*.csproj' InsertAttributes: true FileEncoding: 'auto' WriteBOM: false @@ -86,7 +86,6 @@ steps: sudo apt-get install -y ttf-mscorefonts-installer && sudo fc-cache -f displayName: 'Linux - install windows fonts' condition: eq(variables['friendlyPlatform'], 'Linux') -- task: Assembly-Info-NetCore@3 - task: DotNetCoreCLI@2 displayName: 'dotnet build' inputs: From 069a6474410a8eed44cf2c4e5303ad586c0509f0 Mon Sep 17 00:00:00 2001 From: Ethan Moffat Date: Wed, 9 Mar 2022 23:39:57 -0800 Subject: [PATCH 07/10] Fix copy nuget task. Try different file path specification for only EOLib projects assembly version --- azure-pipelines.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 07180e10b..dc474f053 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -62,8 +62,12 @@ steps: displayName: 'Set nuget package properties' inputs: Path: '$(Build.SourcesDirectory)' - FileNames: '**/EOLib*!(Test).csproj' + FileNames: | + **/EOLib*.csproj + !**/EOLib.*.Test.csproj InsertAttributes: true + FileEncoding: 'auto' + WriteBOM: false GeneratePackageOnBuild: 'true' PackageRequireLicenseAcceptance: 'false' PackageLicenseExpression: 'MIT' @@ -119,8 +123,9 @@ steps: - task: CopyFiles@2 displayName: 'Copy nuget packages' inputs: - SourceFolder: $(Build.SourcesDirectory)/bin/$(buildConfiguration)/**/*.nupkg - TargetFolder: $(Build.ArtifactStagingDirectory)/nuget + SourceFolder: '$(Build.SourcesDirectory)/bin/$(buildConfiguration)/' + Contents: '**/*.nupkg' + TargetFolder: '$(Build.ArtifactStagingDirectory)/nuget' - task: PublishBuildArtifacts@1 displayName: 'Publish nuget Artifacts' inputs: From b74a0f46142bc6c250708ceee9b77e9bca8cfb96 Mon Sep 17 00:00:00 2001 From: Ethan Moffat Date: Wed, 9 Mar 2022 23:42:44 -0800 Subject: [PATCH 08/10] Fix file filter for exluding test projects --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dc474f053..e5204feaf 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -64,7 +64,7 @@ steps: Path: '$(Build.SourcesDirectory)' FileNames: | **/EOLib*.csproj - !**/EOLib.*.Test.csproj + !**/EOLib.*Test.csproj InsertAttributes: true FileEncoding: 'auto' WriteBOM: false From 7e377ed7f43bd51584db7f4c0a1397d58551763e Mon Sep 17 00:00:00 2001 From: Ethan Moffat Date: Wed, 9 Mar 2022 23:53:36 -0800 Subject: [PATCH 09/10] Disable XML doc generation. Publish nugets to platform-specific artifact names --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5204feaf..980620407 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -49,7 +49,7 @@ steps: InsertAttributes: true FileEncoding: 'auto' WriteBOM: false - GenerateDocumentationFile: 'true' + GenerateDocumentationFile: 'false' Authors: 'Ethan Moffat' Copyright: 'Copyright © 2014-2022 Ethan Moffat' VersionNumber: '$(Build.BuildNumber)' @@ -130,7 +130,7 @@ steps: displayName: 'Publish nuget Artifacts' inputs: PathtoPublish: $(Build.ArtifactStagingDirectory)/nuget - ArtifactName: nuget + ArtifactName: nuget.$(friendlyPlatform) - script: | git tag build/$(Build.BuildNumber) From 361accfe3759a2b1847003d8d467c1f10818a850 Mon Sep 17 00:00:00 2001 From: Ethan Moffat Date: Thu, 10 Mar 2022 00:05:14 -0800 Subject: [PATCH 10/10] Rev version to 0.5.x --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 980620407..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