diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2022-01-20 18:01:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 18:01:23 +0300 |
| commit | 6f5e5ebcf6d9a72c5115660cea57159d43687fce (patch) | |
| tree | a083fa7b40723eb710774528ed2ed05c3491536f | |
| parent | 83f04bbd1622fe29d620659b97413ad593b0cad6 (diff) | |
Fix build
| -rw-r--r-- | azure-pipelines.yml | 22 | ||||
| -rw-r--r-- | bot-provisioning/dependencies.csx | 2 | ||||
| -rw-r--r-- | global.json | 2 | ||||
| -rw-r--r-- | mautil/mautil.csproj | 7 |
4 files changed, 19 insertions, 14 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9468a01..799b186 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,18 +1,18 @@ pool: - name: Hosted Mac Internal + vmImage: 'macOS-10.15' variables: - name: BuildConfiguration - value: DebugNoGui + value: Debug steps: -- task: Bash@3 - displayName: Provision - inputs: - targetType: 'inline' - script: '$(Build.SourcesDirectory)/bot-provisioning/provisionator-bootstrap.sh $(Build.SourcesDirectory)/bot-provisioning/dependencies.csx' - workingDirectory: '$(Build.SourcesDirectory)' +#- task: Bash@3 +# displayName: Provision +# inputs: +# targetType: 'inline' +# script: '$(Build.SourcesDirectory)/bot-provisioning/provisionator-bootstrap.sh $(Build.SourcesDirectory)/bot-provisioning/dependencies.csx' +# workingDirectory: '$(Build.SourcesDirectory)' - task: DotNetCoreCLI@2 displayName: 'Build solution Mono.Addins.sln' @@ -23,8 +23,12 @@ steps: - task: DotNetCoreCLI@2 displayName: 'Generating packages' inputs: - command: pack + command: custom + custom: pack + projects: Mono.Addins.sln arguments: '/p:Configuration=$(BuildConfiguration)' + nobuild: true + workingDirectory: $(Build.SourcesDirectory) #- task: MSBuild@1 # displayName: 'Test Assemblies Test\UnitTests\bin\Debug\UnitTests.dll' diff --git a/bot-provisioning/dependencies.csx b/bot-provisioning/dependencies.csx index 8b5017c..87574df 100644 --- a/bot-provisioning/dependencies.csx +++ b/bot-provisioning/dependencies.csx @@ -5,4 +5,4 @@ using static Xamarin.Provisioning.ProvisioningScript; using System; using System.Linq; -DotNetSdk("global.json")
\ No newline at end of file +DotNetSdk("../global.json") diff --git a/global.json b/global.json index e52d340..eb4893e 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.101" + "version": "5.0" } } diff --git a/mautil/mautil.csproj b/mautil/mautil.csproj index c371024..231f355 100644 --- a/mautil/mautil.csproj +++ b/mautil/mautil.csproj @@ -7,7 +7,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>8.0.30703</ProductVersion> <ProjectGuid>{EA2F08DC-8289-4A89-A405-1A70D8B4C569}</ProjectGuid> - <TargetFrameworks>net6.0;$(DotNetFrameworkTarget)</TargetFrameworks> + <TargetFrameworks>net5.0;$(DotNetFrameworkTarget)</TargetFrameworks> <OutputType>Exe</OutputType> <AssemblyName>mautil</AssemblyName> <SchemaVersion>2.0</SchemaVersion> @@ -15,12 +15,13 @@ <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <AssemblyVersion>1.0.0.0</AssemblyVersion> + <IsPackable>False</IsPackable> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\bin\net6.0</OutputPath> + <OutputPath>..\bin\</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> @@ -29,7 +30,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>True</Optimize> - <OutputPath>..\bin\net6.0</OutputPath> + <OutputPath>..\bin\</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> |