-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Integrate changes needed to use Microsoft.Dotnet.Arcade.Wpf.Sdk
- Loading branch information
1 parent
9cd4b3a
commit 083719d
Showing
26 changed files
with
321 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,8 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project> | ||
| <PropertyGroup> | ||
| <ImportNetSdkFromRepoToolset>false</ImportNetSdkFromRepoToolset> | ||
|
|
||
| <PublishWindowsPdb>true</PublishWindowsPdb> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="$(MsBuildThisFileDirectory)SystemResources.props"/> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" /> | ||
| <Project> | ||
| <Import Project="$(MSBuildThisFileDirectory)eng\WpfArcadeSdk\Sdk\Sdk.props" | ||
| Condition="Exists('$(MSBuildThisFileDirectory)eng\WpfArcadeSdk\Sdk\Sdk.props') and '$(TestWpfArcadeSdk)' != 'true'"/> | ||
|
|
||
| <PropertyGroup> | ||
| <DebugType>full</DebugType> | ||
| </PropertyGroup> | ||
| <Import Sdk="Microsoft.DotNet.Arcade.Wpf.Sdk" | ||
| Project="Sdk.props" | ||
| Condition="!Exists('$(MSBuildThisFileDirectory)eng\WpfArcadeSdk\Sdk\Sdk.props') Or '$(TestWpfArcadeSdk)' == 'true'"/> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project> | ||
| <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" /> | ||
| <Import Project="$(MSBuildThisFileDirectory)Packaging.targets" /> | ||
| <Import Project="$(MSBuildThisFileDirectory)Publishing.targets" /> | ||
| <Import Project="$(MSBuildThisFileDirectory)eng\WpfArcadeSdk\Sdk\Sdk.targets" | ||
| Condition="Exists('$(MSBuildThisFileDirectory)eng\WpfArcadeSdk\Sdk\Sdk.targets') and '$(TestWpfArcadeSdk)' != 'true'"/> | ||
|
|
||
| <Import Sdk="Microsoft.DotNet.Arcade.Wpf.Sdk" | ||
| Project="Sdk.targets" | ||
| Condition="!Exists('$(MSBuildThisFileDirectory)eng\WpfArcadeSdk\Sdk\Sdk.targets') Or '$(TestWpfArcadeSdk)' == 'true'"/> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| source="${BASH_SOURCE[0]}" | ||
|
|
||
| # resolve $SOURCE until the file is no longer a symlink | ||
| while [[ -h $source ]]; do | ||
| scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" | ||
| source="$(readlink "$source")" | ||
|
|
||
| # if $source was a relative symlink, we need to resolve it relative to the path where the | ||
| # symlink file was located | ||
| [[ $source != /* ]] && source="$scriptroot/$source" | ||
| done | ||
|
|
||
| scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" | ||
| "$scriptroot/eng/common/build.sh" --build --restore $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| # | ||
| # This file should be kept in sync across https://www.github.com/dotnet/wpf and dotnet-wpf-int repos. | ||
| # | ||
|
|
||
| parameters: | ||
| name: '' | ||
| # send telemetry | ||
| enableTelemetry: true | ||
| # install Microbuild plugin if not a public build | ||
| enableMicrobuild: true | ||
| # queue YAML object - https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-schema.md#queue | ||
| queue: {} | ||
| # variables YAML object - https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-schema.md#phase | ||
| variables: {} | ||
| # run this build as a public build, even in the internal project | ||
| runAsPublic: false | ||
|
|
||
| # Common conditionals: There are a number of common conditionals that are useful. Generally these are used to decide what resources can be accessed, | ||
| # or what logic should be applied based on the context the build is being run in. | ||
| # - eq/ne(variables['Agent.Os'], 'Windows_NT') - Running/not running on a windows machine | ||
| # - eq/ne(variables['System.TeamProject'], 'public') - Running/not running on the dotnet public VSTS project | ||
| # - and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest') - Not running in public and not a pull request. | ||
| # - or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest') - Running in public or a pull request. | ||
|
|
||
| phases: | ||
| - template: /eng/common/templates/phases/base.yml | ||
| parameters: | ||
| enableTelemetry: ${{ parameters.enableTelemetry }} | ||
|
|
||
| enableMicrobuild: ${{ parameters.enableMicrobuild }} | ||
|
|
||
| name: ${{ parameters.name }} | ||
|
|
||
| queue: ${{ parameters.queue }} | ||
|
|
||
| runAsPublic: ${{ parameters.runAsPublic }} | ||
|
|
||
| variables: | ||
| ${{ insert }}: ${{ parameters.variables }} | ||
| _HelixBuildConfig: $(_BuildConfig) | ||
| # Only enable publishing in non-public, non PR scenarios. | ||
| ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: | ||
| # This should be changed to an isolated blob feed per-build. | ||
| # Right now a manual build of a random branch would get published alongside the normal branch artifacts. | ||
| _PublishBlobFeedUrl: https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json | ||
| _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) | ||
| _PublishArgs: /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1) | ||
| /p:DotNetPublishBlobFeedUrl=$(_PublishBlobFeedUrl) | ||
| /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed) | ||
| /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) | ||
| /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) | ||
| _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) | ||
| # else | ||
| ${{ if or(eq(parameters.runAsPublic, 'true'), eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: | ||
| _PublishArgs: '' | ||
| _OfficialBuildIdArgs: '' | ||
| _SignArgs: '' | ||
|
|
||
| steps: | ||
| - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: | ||
| - task: AzureKeyVault@1 | ||
| inputs: | ||
| azureSubscription: 'DotNet-Engineering-Services_KeyVault' | ||
| KeyVaultName: EngKeyVault | ||
| SecretsFilter: 'dotnetfeed-storage-access-key-1,microsoft-symbol-server-pat,symweb-symbol-server-pat' | ||
|
|
||
| # Use utility script to run script command dependent on agent OS. | ||
| - script: eng\common\cibuild.cmd | ||
| -configuration $(_BuildConfig) | ||
| -prepareMachine | ||
| $(_PublishArgs) | ||
| $(_SignArgs) | ||
| $(_OfficialBuildIdArgs) | ||
| /p:Platform=$(_Platform) /p:IsShipping=$(_IsShipping) | ||
| displayName: Windows Build / Publish | ||
| condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) | ||
|
|
||
| - task: PublishBuildArtifacts@1 | ||
| displayName: Publish Logs to VSTS | ||
| inputs: | ||
| PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' | ||
| PublishLocation: Container | ||
| ArtifactName: $(Agent.Os)_$(Agent.JobName) | ||
| continueOnError: true | ||
| condition: always() | ||
|
|
||
| - task: PublishTestResults@2 | ||
| displayName: Publish Test Results | ||
| inputs: | ||
| testResultsFormat: 'xUnit' | ||
| testResultsFiles: '*.xml' | ||
| searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' | ||
| continueOnError: true | ||
| condition: always() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # | ||
| # This file should be kept in sync across https://www.github.com/dotnet/wpf and dotnet-wpf-int repos. | ||
| # | ||
|
|
||
| # This repo uses C++/CLI /clr:pure (or /clr:netcore) switches during compilation, which are | ||
| # deprecated. Ensure that this warning is always suppressed during build. | ||
| if (($properties -eq $null) -or (-not ($properties -icontains '/nowarn:D9035'))) { | ||
| $properties = @('/nowarn:D9035') + $properties | ||
| } | ||
|
|
||
| # Always generate binary logs | ||
| $binaryLog = $true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # | ||
| # This file should be kept in sync across https://www.github.com/dotnet/wpf and dotnet-wpf-int repos. | ||
| # | ||
|
|
||
| . $PsScriptRoot\common\init-tools-native.ps1 -InstallDirectory $PSScriptRoot\..\.tools\native -GlobalJsonFile $PSScriptRoot\..\global.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <IsPackagingProject>true</IsPackagingProject> | ||
| </PropertyGroup> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" /> | ||
| <PropertyGroup> | ||
| <TargetName>Dummy-$(PackageName)</TargetName> | ||
| <NoBuild>true</NoBuild> | ||
| <IncludeBuildOutput>false</IncludeBuildOutput> | ||
| <CreateArchNeutralPackage Condition="$(MSBuildProjectName.Contains('.ArchNeutral'))">true</CreateArchNeutralPackage> | ||
|
|
||
| <!-- | ||
| Set $(IsPackable) = true, except when | ||
| $(CreateArchNeutralPackage) == true && $(Platform) != x86 | ||
| The idea here is that for arch-neutral packages, only the x86 build phase will generate the nuget package | ||
| The platform/RID specific packages will be generated in their respective $(Platform) specific build phases | ||
| --> | ||
| <IsPackable>true</IsPackable> | ||
| <IsPackable Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32' and '$(Platform)'!='x86') and '$(CreateArchNeutralPackage)'=='true'">false</IsPackable> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <DefaultPackageLicenseExpression>MIT</DefaultPackageLicenseExpression> | ||
| <DefaultPackageLicenseFile>LICENSE.TXT</DefaultPackageLicenseFile> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackagingContent Condition="Exists('$(RepoRoot)LICENSE.TXT')" | ||
| Include="$(RepoRoot)LICENSE.TXT" | ||
| SubFolder="root" /> | ||
| <PackagingContent Condition="Exists('$(RepoRoot)THIRD-PARTY-NOTICES.TXT')" | ||
| Include="$(RepoRoot)THIRD-PARTY-NOTICES.TXT" | ||
| SubFolder="root" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <Project> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" /> | ||
|
|
||
| <Target Name="UpdatePackageLicenseUrl" BeforeTargets="CreateNuspec"> | ||
| <CreateProperty Value="$(ScmRepositoryUrl)/blob/master/LICENSE.TXT"> | ||
| <Output PropertyName="PackageLicenseUrl" TaskParameter="Value"/> | ||
| </CreateProperty> | ||
| </Target> | ||
| </Project> |
12 changes: 12 additions & 0 deletions
12
packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <Project Sdk="Microsoft.Build.NoTargets"> | ||
| <PropertyGroup> | ||
| <ProjectGuid>9a7e395b-e859-40e2-809d-efb72cf3a2ee</ProjectGuid> | ||
| <TargetFramework>netcoreapp3.0</TargetFramework> | ||
| <Platforms>AnyCPU;x64</Platforms> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageName>$(MSBuildProjectName.Replace('.ArchNeutral',''))</PackageName> | ||
| <NuspecFile>$(ArtifactsPackagingDir)$(MSBuildProjectName).nuspec</NuspecFile> | ||
| </PropertyGroup> | ||
| </Project> |
12 changes: 12 additions & 0 deletions
12
packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <Project Sdk="Microsoft.Build.NoTargets"> | ||
| <PropertyGroup> | ||
| <ProjectGuid>c847934a-828c-4ebb-a004-b0e97c8313f4</ProjectGuid> | ||
| <TargetFramework>netcoreapp3.0</TargetFramework> | ||
| <Platforms>AnyCPU;x64</Platforms> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageName>$(MSBuildProjectName.Replace('.ArchNeutral',''))</PackageName> | ||
| <NuspecFile>$(ArtifactsPackagingDir)$(MSBuildProjectName).nuspec</NuspecFile> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Project> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" /> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Project> | ||
| <PropertyGroup> | ||
| <WpfSourceDir>$(MSBuildThisFileDirectory)src\</WpfSourceDir> | ||
| </PropertyGroup> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" /> | ||
| </Project> |
Oops, something went wrong.