From 77b773bc153d8dd76ed704f32b0336f379188b3e Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 26 Aug 2021 13:41:49 +0100 Subject: [PATCH 01/14] GitInfo Take Two [WIP] --- .gitignore | 1 + Directory.Build.props | 9 +++++-- GitInfo.txt | 1 + Makefile | 1 + .../Java.Interop.BootstrapTasks.csproj | 2 ++ .../GenerateVersionFile.cs | 27 +++++++++++++++++++ build-tools/scripts/Prepare.targets | 5 +++- build-tools/scripts/Version.props.in | 8 ++++++ build-tools/scripts/VersionInfo.targets | 25 +++++++++++++++++ src/Java.Interop/Java.Interop.csproj | 1 - src/Java.Interop/Properties/AssemblyInfo.cs | 7 ----- 11 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 GitInfo.txt create mode 100644 build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/GenerateVersionFile.cs create mode 100644 build-tools/scripts/Version.props.in create mode 100644 build-tools/scripts/VersionInfo.targets diff --git a/.gitignore b/.gitignore index f3996b884..e17ee5cec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ bin Configuration.Override.props +Version.props obj JavaDeveloper-2013005_dp__11m4609.pkg LocalJDK diff --git a/Directory.Build.props b/Directory.Build.props index 3038194c7..b618ab412 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,8 +4,9 @@ Debug <_OutputPath>$(MSBuildThisFileDirectory)bin\Build$(Configuration)\ + true - + cs;de;es;fr;it;ja;ko;pl;pt-BR;ru;tr;zh-Hans;zh-Hant true @@ -19,6 +20,10 @@ Project="$([System.IO.Path]::GetDirectoryName($(MSBuildThisFileDirectory))).override.props" Condition=" Exists('$([System.IO.Path]::GetDirectoryName($(MSBuildThisFileDirectory))).override.props') " /> + $(DotnetToolPath) "$(_JNIEnvGenPath)" <_RunJNIEnvGen Condition=" '$(JIBuildingForNetCoreApp)' != 'True' ">$(Runtime) "$(_JNIEnvGenPath)" - + diff --git a/GitInfo.txt b/GitInfo.txt new file mode 100644 index 000000000..ceab6e11e --- /dev/null +++ b/GitInfo.txt @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/Makefile b/Makefile index f44a1658f..90e4f0bcb 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,7 @@ bin/Build$(CONFIGURATION)/Java.Interop.BootstrapTasks.dll: build-tools/Java.Inte external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj \ $(wildcard build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/*.cs) $(MSBUILD) $(MSBUILD_FLAGS) /restore "$<" + $(MSBUILD) $(MSBUILD_FLAGS) /restore /t:GenerateVersionInfo "$<" prepare-external $(PREPARE_EXTERNAL_FILES): git submodule update --init --recursive diff --git a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj index 77f5a8667..85b828a55 100644 --- a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj +++ b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj @@ -18,4 +18,6 @@ + + diff --git a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/GenerateVersionFile.cs b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/GenerateVersionFile.cs new file mode 100644 index 000000000..c6e8503f2 --- /dev/null +++ b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/GenerateVersionFile.cs @@ -0,0 +1,27 @@ +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using System; +using System.IO; +using System.Collections.Generic; + + +namespace Java.Interop.BootstrapTasks +{ + public class GenerateVersionFile : Task + { + public ITaskItem InputFile { get; set; } + public ITaskItem OutputFile { get; set; } + + public ITaskItem [] Replacements { get; set; } + public override bool Execute () + { + string text = File.ReadAllText (InputFile.ItemSpec); + foreach (var replacement in Replacements) + { + text = text.Replace (replacement.ItemSpec, replacement.GetMetadata ("Replacement")); + } + File.WriteAllText (OutputFile.ItemSpec, text); + return !Log.HasLoggedErrors; + } + } +} diff --git a/build-tools/scripts/Prepare.targets b/build-tools/scripts/Prepare.targets index b13e9651a..5dc688d4c 100644 --- a/build-tools/scripts/Prepare.targets +++ b/build-tools/scripts/Prepare.targets @@ -6,7 +6,10 @@ - + <_MaxJdk>$(MaxJdkVersion) <_MaxJdk Condition=" '$(_MaxJdk)' == '' ">$(JI_MAX_JDK) diff --git a/build-tools/scripts/Version.props.in b/build-tools/scripts/Version.props.in new file mode 100644 index 000000000..e65e68baf --- /dev/null +++ b/build-tools/scripts/Version.props.in @@ -0,0 +1,8 @@ + + +@VERSION@ +@VERSION@ git-rev-head:@COMMIT@ git-branch:@BRANCH@ +Microsoft Corporation +Microsoft Corporation + + \ No newline at end of file diff --git a/build-tools/scripts/VersionInfo.targets b/build-tools/scripts/VersionInfo.targets new file mode 100644 index 000000000..bf0a5692f --- /dev/null +++ b/build-tools/scripts/VersionInfo.targets @@ -0,0 +1,25 @@ + + + + + + main + false + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Java.Interop/Java.Interop.csproj b/src/Java.Interop/Java.Interop.csproj index 263a61de3..e61282d0e 100644 --- a/src/Java.Interop/Java.Interop.csproj +++ b/src/Java.Interop/Java.Interop.csproj @@ -22,7 +22,6 @@ ..\..\product.snk INTEROP;FEATURE_JNIENVIRONMENT_JI_PINVOKES;FEATURE_JNIOBJECTREFERENCE_INTPTRS;INTERNAL_NULLABLE_ATTRIBUTES;$(JavaInteropDefineConstants) true - false $(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework.ToLowerInvariant())\ $(ToolOutputFullPath) $(ToolOutputFullPath)Java.Interop.xml diff --git a/src/Java.Interop/Properties/AssemblyInfo.cs b/src/Java.Interop/Properties/AssemblyInfo.cs index 5222403e5..b32e4cf93 100644 --- a/src/Java.Interop/Properties/AssemblyInfo.cs +++ b/src/Java.Interop/Properties/AssemblyInfo.cs @@ -3,16 +3,9 @@ using System.Runtime.InteropServices; [assembly: DefaultDllImportSearchPathsAttribute (DllImportSearchPath.SafeDirectories | DllImportSearchPath.AssemblyDirectory)] - -[assembly: AssemblyTitle ("Java.Interop")] [assembly: AssemblyDescription ("")] [assembly: AssemblyCulture ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("Microsoft Corporation")] -[assembly: AssemblyCopyright ("Microsoft Corporation")] -[assembly: AssemblyProduct ("")] [assembly: AssemblyTrademark ("Microsoft Corporation")] -[assembly: AssemblyVersion ("0.1.0.0")] [assembly: AssemblyMetadata ("IsTrimmable", "True")] [assembly: InternalsVisibleTo ( From 2a0d9af05cac8d184885de04052437f88bbab83e Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 26 Aug 2021 17:08:41 +0100 Subject: [PATCH 02/14] try this --- build-tools/scripts/AssemblyInfo.g.cs.in | 23 +++++++++++++++++++ build-tools/scripts/VersionInfo.targets | 19 +++++++++++++++ .../Java.Interop-MonoAndroid.csproj | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 build-tools/scripts/AssemblyInfo.g.cs.in diff --git a/build-tools/scripts/AssemblyInfo.g.cs.in b/build-tools/scripts/AssemblyInfo.g.cs.in new file mode 100644 index 000000000..6ae41934d --- /dev/null +++ b/build-tools/scripts/AssemblyInfo.g.cs.in @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// 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. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Microsoft Corporation")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("@CONFIGURATION@")] +[assembly: System.Reflection.AssemblyCopyrightAttribute("Microsoft Corporation")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("@VERSION@.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("@VERSION@ git-rev-head:@COMMIT@ git-branch:@BRANCH@")] +[assembly: System.Reflection.AssemblyProductAttribute("@PRODUCT@")] +[assembly: System.Reflection.AssemblyTitleAttribute("@TITLE@")] +[assembly: System.Reflection.AssemblyVersionAttribute("@VERSION@.0")] + +// Generated by the MSBuild WriteCodeFragment class. \ No newline at end of file diff --git a/build-tools/scripts/VersionInfo.targets b/build-tools/scripts/VersionInfo.targets index bf0a5692f..2b7de847a 100644 --- a/build-tools/scripts/VersionInfo.targets +++ b/build-tools/scripts/VersionInfo.targets @@ -22,4 +22,23 @@ Replacements="@(Replacements)" /> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Java.Interop/Java.Interop-MonoAndroid.csproj b/src/Java.Interop/Java.Interop-MonoAndroid.csproj index 9061a960f..b667313b1 100644 --- a/src/Java.Interop/Java.Interop-MonoAndroid.csproj +++ b/src/Java.Interop/Java.Interop-MonoAndroid.csproj @@ -16,6 +16,7 @@ ..\..\product.snk 8.0 true + true @@ -85,6 +86,7 @@ + BuildVersionInfo_g_cs; BuildJniEnvironment_g_cs; BuildInteropJar; $(BuildDependsOn) From 2b5fc7cceeb318915ac8dfd92bdb1c52357d3e80 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 26 Aug 2021 17:27:17 +0100 Subject: [PATCH 03/14] try this two --- build-tools/scripts/VersionInfo.targets | 19 ------------------- src/Java.Interop/Directory.Build.targets | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/build-tools/scripts/VersionInfo.targets b/build-tools/scripts/VersionInfo.targets index 2b7de847a..bf0a5692f 100644 --- a/build-tools/scripts/VersionInfo.targets +++ b/build-tools/scripts/VersionInfo.targets @@ -22,23 +22,4 @@ Replacements="@(Replacements)" /> - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Java.Interop/Directory.Build.targets b/src/Java.Interop/Directory.Build.targets index c91706ab8..ea883aa3e 100644 --- a/src/Java.Interop/Directory.Build.targets +++ b/src/Java.Interop/Directory.Build.targets @@ -31,4 +31,22 @@ + + + + + + + + + + + + + + \ No newline at end of file From 2a541c04ae6a0ac168c51c44e58ffbf8a988601d Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 26 Aug 2021 17:34:51 +0100 Subject: [PATCH 04/14] fix it --- src/Java.Interop/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Java.Interop/Directory.Build.targets b/src/Java.Interop/Directory.Build.targets index ea883aa3e..442549f2e 100644 --- a/src/Java.Interop/Directory.Build.targets +++ b/src/Java.Interop/Directory.Build.targets @@ -31,7 +31,7 @@ - + From 3668f4bf8f04fea9145bd8a8880734f555550534 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 26 Aug 2021 17:45:01 +0100 Subject: [PATCH 05/14] sigh --- src/Java.Interop/Directory.Build.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Java.Interop/Directory.Build.targets b/src/Java.Interop/Directory.Build.targets index 442549f2e..b2d99dbb9 100644 --- a/src/Java.Interop/Directory.Build.targets +++ b/src/Java.Interop/Directory.Build.targets @@ -31,6 +31,7 @@ + From 4fec071bb63f8d2fbb924872a56a828915e50002 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 26 Aug 2021 19:09:47 +0100 Subject: [PATCH 06/14] again --- build-tools/scripts/AssemblyInfo.g.cs.in | 2 +- src/Java.Interop/Directory.Build.targets | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build-tools/scripts/AssemblyInfo.g.cs.in b/build-tools/scripts/AssemblyInfo.g.cs.in index 6ae41934d..15d49cc72 100644 --- a/build-tools/scripts/AssemblyInfo.g.cs.in +++ b/build-tools/scripts/AssemblyInfo.g.cs.in @@ -15,7 +15,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyConfigurationAttribute("@CONFIGURATION@")] [assembly: System.Reflection.AssemblyCopyrightAttribute("Microsoft Corporation")] [assembly: System.Reflection.AssemblyFileVersionAttribute("@VERSION@.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("@VERSION@ git-rev-head:@COMMIT@ git-branch:@BRANCH@")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("@INFORMATIONALVERSION@")] [assembly: System.Reflection.AssemblyProductAttribute("@PRODUCT@")] [assembly: System.Reflection.AssemblyTitleAttribute("@TITLE@")] [assembly: System.Reflection.AssemblyVersionAttribute("@VERSION@.0")] diff --git a/src/Java.Interop/Directory.Build.targets b/src/Java.Interop/Directory.Build.targets index b2d99dbb9..9bc892ef5 100644 --- a/src/Java.Interop/Directory.Build.targets +++ b/src/Java.Interop/Directory.Build.targets @@ -31,12 +31,11 @@ - + - - - + + From 2c2fe9a28036130aba2a31ca4e226e432ac85eec Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 26 Aug 2021 20:06:22 +0100 Subject: [PATCH 07/14] foo foo --- Makefile | 1 - build-tools/scripts/VersionInfo.targets | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 90e4f0bcb..f44a1658f 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,6 @@ bin/Build$(CONFIGURATION)/Java.Interop.BootstrapTasks.dll: build-tools/Java.Inte external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj \ $(wildcard build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/*.cs) $(MSBUILD) $(MSBUILD_FLAGS) /restore "$<" - $(MSBUILD) $(MSBUILD_FLAGS) /restore /t:GenerateVersionInfo "$<" prepare-external $(PREPARE_EXTERNAL_FILES): git submodule update --init --recursive diff --git a/build-tools/scripts/VersionInfo.targets b/build-tools/scripts/VersionInfo.targets index bf0a5692f..bb0ac29bb 100644 --- a/build-tools/scripts/VersionInfo.targets +++ b/build-tools/scripts/VersionInfo.targets @@ -10,7 +10,7 @@ - + From 783e607b02e4feeaa741edd1002488eb34df5e32 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 26 Aug 2021 20:31:57 +0100 Subject: [PATCH 08/14] Remove unneeded AssemblyVersion properties --- src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj | 3 --- src/Java.Interop.Export/Java.Interop.Export.csproj | 3 --- .../Java.Interop.GenericMarshaler.csproj | 3 --- .../Java.Interop.Tools.JavaSource.csproj | 3 --- 4 files changed, 12 deletions(-) diff --git a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj index 0204f38b3..228da5b2a 100644 --- a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj +++ b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj @@ -7,9 +7,6 @@ true ..\..\product.snk Java.Interop.Dynamic - Microsoft Corporation - Microsoft Corporation - 0.1.0.0 $(ToolOutputFullPath) diff --git a/src/Java.Interop.Export/Java.Interop.Export.csproj b/src/Java.Interop.Export/Java.Interop.Export.csproj index 8d923e92d..b1dd39bd6 100644 --- a/src/Java.Interop.Export/Java.Interop.Export.csproj +++ b/src/Java.Interop.Export/Java.Interop.Export.csproj @@ -7,9 +7,6 @@ true ..\..\product.snk Java.Interop.Export - Microsoft Corporation - Microsoft Corporation - 0.1.0.0 $(ToolOutputFullPath) diff --git a/src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj b/src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj index 62da24d00..1b69c773e 100644 --- a/src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj +++ b/src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj @@ -7,9 +7,6 @@ true ..\..\product.snk Java.Interop.GenericMarshaler - Microsoft Corporation - Microsoft Corporation - 0.1.0.0 $(ToolOutputFullPath) diff --git a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource.csproj b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource.csproj index ea4be696a..9dce7a0ac 100644 --- a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource.csproj +++ b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource.csproj @@ -7,9 +7,6 @@ INTERNAL_NULLABLE_ATTRIBUTES {5C0B3562-8DA0-4726-9762-75B9709ED6B7} Java.Interop.Tools.JavaSource - Microsoft Corporation - Microsoft Corporation - 0.1.0.0 $(ToolOutputFullPath) From c343a66b58a7b850ebb51c8f4f415fa9fd406cf4 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 26 Aug 2021 21:35:01 +0100 Subject: [PATCH 09/14] Archive dotnet build bits so we can check them --- build-tools/automation/azure-pipelines.yaml | 33 +++++++++++++++------ 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 6888adaf8..7c03d0272 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -58,7 +58,7 @@ jobs: solution: Java.Interop.sln configuration: $(Build.Configuration) msbuildArguments: /restore - + - task: MSBuild@1 displayName: MSBuild RunNUnitTests.targets inputs: @@ -93,7 +93,22 @@ jobs: runNativeDotnetTests: true - template: templates\fail-on-issue.yaml - + + - task: ArchiveFiles@2 + displayName: 'Archive build outputs' + inputs: + rootFolderOrFile: 'bin' + archiveType: 'zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/bin-dotnet.zip' + replaceExistingArchive: true + condition: succeededOrFailed() + + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: debug' + inputs: + ArtifactName: debug + condition: succeededOrFailed() + - job: mac_build displayName: Mac - Mono pool: @@ -114,10 +129,10 @@ jobs: - script: make prepare CONFIGURATION=$(Build.Configuration) JI_MAX_JDK=$(MaxJdkVersion) displayName: make prepare - + - script: make all CONFIGURATION=$(Build.Configuration) JI_MAX_JDK=$(MaxJdkVersion) displayName: make all - + - script: | r=0 make run-all-tests CONFIGURATION=$(Build.Configuration) JI_MAX_JDK=$(MaxJdkVersion) || r=$? @@ -139,7 +154,7 @@ jobs: SourceFolder: $(System.DefaultWorkingDirectory) Contents: | xatb.jar - bin.zip + bin.zip TargetFolder: $(Build.ArtifactStagingDirectory) condition: succeededOrFailed() @@ -148,7 +163,7 @@ jobs: inputs: ArtifactName: debug condition: succeededOrFailed() - + - job: mac_dotnet_build displayName: Mac - .NET Core pool: @@ -161,12 +176,12 @@ jobs: submodules: recursive - template: templates\install-dependencies.yaml - + - script: make prepare-core CONFIGURATION=$(Build.Configuration) JI_MAX_JDK=$(MaxJdkVersion) displayName: make prepare-core - + - template: templates\core-build.yaml - + - template: templates\core-tests.yaml parameters: runNativeTests: true From c59940c0639c2b40641ae2222ee7283980250bdd Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 26 Aug 2021 21:39:32 +0100 Subject: [PATCH 10/14] Archive dotnet build bits so we can check them 2 --- build-tools/automation/azure-pipelines.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 7c03d0272..adf4f9d88 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -101,7 +101,7 @@ jobs: archiveType: 'zip' archiveFile: '$(Build.ArtifactStagingDirectory)/bin-dotnet.zip' replaceExistingArchive: true - condition: succeededOrFailed() + condition: succeededOrFailed() - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: debug' From 93805d47a4971e5a9976ea2bd224289edd90bb9e Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 26 Aug 2021 21:40:35 +0100 Subject: [PATCH 11/14] Archive dotnet build bits so we can check them 3 --- build-tools/automation/azure-pipelines.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index adf4f9d88..ce6da00d6 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -103,11 +103,11 @@ jobs: replaceExistingArchive: true condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact: debug' - inputs: - ArtifactName: debug - condition: succeededOrFailed() + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: debug' + inputs: + ArtifactName: debug + condition: succeededOrFailed() - job: mac_build displayName: Mac - Mono From 52835d2d16c7549b3e8cb636938b00d7e5c39aa5 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 27 Aug 2021 16:05:35 +0100 Subject: [PATCH 12/14] rework --- build-tools/scripts/Version.props.in | 12 ++++++------ build-tools/scripts/VersionInfo.targets | 14 +++++++++----- src/Java.Interop/Directory.Build.targets | 9 +++++---- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/build-tools/scripts/Version.props.in b/build-tools/scripts/Version.props.in index e65e68baf..cbefc19da 100644 --- a/build-tools/scripts/Version.props.in +++ b/build-tools/scripts/Version.props.in @@ -1,8 +1,8 @@ - -@VERSION@ -@VERSION@ git-rev-head:@COMMIT@ git-branch:@BRANCH@ -Microsoft Corporation -Microsoft Corporation - + + @VERSION@ + @VERSION@ git-rev-head:@COMMIT@ git-branch:@BRANCH@ + Microsoft Corporation + Microsoft Corporation + \ No newline at end of file diff --git a/build-tools/scripts/VersionInfo.targets b/build-tools/scripts/VersionInfo.targets index bb0ac29bb..eb50050d3 100644 --- a/build-tools/scripts/VersionInfo.targets +++ b/build-tools/scripts/VersionInfo.targets @@ -1,7 +1,8 @@ - + main false @@ -10,16 +11,19 @@ - + \ No newline at end of file diff --git a/src/Java.Interop/Directory.Build.targets b/src/Java.Interop/Directory.Build.targets index 9bc892ef5..c5bd6af31 100644 --- a/src/Java.Interop/Directory.Build.targets +++ b/src/Java.Interop/Directory.Build.targets @@ -32,7 +32,8 @@ - + @@ -41,9 +42,9 @@ From 6de788609c33bb84e660faee4dc86c5f075b99d7 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 27 Aug 2021 16:07:35 +0100 Subject: [PATCH 13/14] move Version.props --- Directory.Build.props | 4 ++-- build-tools/scripts/VersionInfo.targets | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index b618ab412..604e4b506 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -21,8 +21,8 @@ Condition=" Exists('$([System.IO.Path]::GetDirectoryName($(MSBuildThisFileDirectory))).override.props') " /> + Condition="!Exists ('$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Version.props')"> @@ -22,7 +22,7 @@ From bca144f2fd574ea9d1ded43515ca160dea7dc59f Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 8 Sep 2021 10:52:11 +0100 Subject: [PATCH 14/14] Remove unneeded entry from .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index e17ee5cec..f3996b884 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ bin Configuration.Override.props -Version.props obj JavaDeveloper-2013005_dp__11m4609.pkg LocalJDK