diff --git a/Directory.Build.props b/Directory.Build.props
index 52a46572..b6c03a07 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,18 +1,18 @@
-
*log
true
Latest
+
+
Microsoft
Microsoft
© Microsoft Corporation. All rights reserved.
$(MSBuildThisFileDirectory)LICENSE.txt
https://github.com/Microsoft/MSBuildSdks
- https://github.com/Microsoft/msbuild/raw/master/branding/MSBuild-NuGet-Icon.png
+ $(MSBuildThisFileDirectory)branding\MSBuild-NuGet-Icon.png
https://github.com/Microsoft/MSBuildSdks.git
-
\ No newline at end of file
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 17ac3d31..312d9e9c 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -21,7 +21,7 @@
copyright=$(Copyright);
projecturl=$(PackageProjectUrl);
licensefile=$(PackageLicenseFile);
- iconurl=$(PackageIconUrl);
+ icon=$(PackageIconPath);
tags=$(PackageTags);
packagetype=MSBuildSdk
diff --git a/MSBuildSdks.sln b/MSBuildSdks.sln
index c93e8b81..431f6558 100644
--- a/MSBuildSdks.sln
+++ b/MSBuildSdks.sln
@@ -7,6 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Traversal",
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DC479DC1-DD8C-4DBA-AA37-FC3D39F24266}"
ProjectSection(SolutionItems) = preProject
+ azure-pipelines.yml = azure-pipelines.yml
Directory.Build.props = Directory.Build.props
Directory.Build.rsp = Directory.Build.rsp
Directory.Build.targets = Directory.Build.targets
@@ -53,7 +54,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CentralPackageVersions", "C
samples\CentralPackageVersions\Packages.props = samples\CentralPackageVersions\Packages.props
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassLibrary", "samples\CentralPackageVersions\src\ClassLibrary\ClassLibrary.csproj", "{A266FDFA-BE7C-4E3E-9BEA-EF18EF66540C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibrary", "samples\CentralPackageVersions\src\ClassLibrary\ClassLibrary.csproj", "{A266FDFA-BE7C-4E3E-9BEA-EF18EF66540C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 286e3ed8..d90ccf7e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,30 +1,56 @@
-pool:
- name: Hosted VS2017
+resources:
+- repo: self
variables:
+ BuildConfiguration: 'Debug'
+ BuildPlatform: 'AnyCPU'
+ DotNetCore3Version: '3.0.100'
SignType: 'Test'
- Configuration: 'Debug'
-steps:
-- task: MSBuild@1
- displayName: 'Build dirs.proj'
- inputs:
- solution: dirs.proj
- platform: 'AnyCPU'
- configuration: '$(Configuration)'
- msbuildArguments: '"/Property:ArtifactsPath=$(Build.StagingDirectory);SignType=$(SignType);PublicRelease=true" "/BinaryLogger:$(Build.StagingDirectory)\logs\build.binlog"'
+trigger:
+ batch: true
+ branches:
+ include:
+ - 'master'
+ - 'refs/tags/*'
+ paths:
+ exclude:
+ - '*.md'
+pr:
+ branches:
+ include:
+ - master
+ paths:
+ exclude:
+ - '*.md'
-- task: VSTest@2
- displayName: 'Run Unit Tests'
- inputs:
- testAssemblyVer2: |
- **\*Tests.dll
- !**\obj\**
- runInParallel: false
-
-- task: PublishBuildArtifacts@1
- displayName: 'Publish Artifact: Logs'
- inputs:
- PathtoPublish: '$(Build.StagingDirectory)\logs'
- ArtifactName: logs
- condition: always()
+jobs:
+- job: BuildAndTest
+ displayName: 'Build and Test'
+ pool:
+ vmImage: windows-latest
+ steps:
+ - task: UseDotNet@2
+ displayName: 'Install .NET Core 3.0'
+ inputs:
+ version: '$(DotNetCore3Version)'
+ - task: MSBuild@1
+ displayName: 'Build dirs.proj'
+ inputs:
+ solution: dirs.proj
+ platform: '$(BuildPlatform)'
+ configuration: '$(BuildConfiguration)'
+ msbuildArguments: '"/Property:ArtifactsPath=$(Build.StagingDirectory);SignType=$(SignType);PublicRelease=true" "/BinaryLogger:$(Build.StagingDirectory)\logs\build.binlog"'
+ - task: VSTest@2
+ displayName: 'Run Unit Tests'
+ inputs:
+ testAssemblyVer2: |
+ **\*Tests.dll
+ !**\obj\**
+ runInParallel: false
+ - task: PublishBuildArtifacts@1
+ displayName: 'Publish Artifact: Logs'
+ inputs:
+ PathtoPublish: '$(Build.StagingDirectory)\logs'
+ ArtifactName: logs
+ condition: always()
\ No newline at end of file
diff --git a/branding/MSBuild-NuGet-Icon.png b/branding/MSBuild-NuGet-Icon.png
new file mode 100644
index 00000000..d51ddc13
Binary files /dev/null and b/branding/MSBuild-NuGet-Icon.png differ
diff --git a/src/Artifacts/Microsoft.Build.Artifacts.csproj b/src/Artifacts/Microsoft.Build.Artifacts.csproj
index 5e780959..a6660e03 100644
--- a/src/Artifacts/Microsoft.Build.Artifacts.csproj
+++ b/src/Artifacts/Microsoft.Build.Artifacts.csproj
@@ -1,12 +1,13 @@
-
net46;net472;netcoreapp2.1
build\
true
MIT
+ images\MSBuild-NuGet-Icon.png
true
+ NU5128
@@ -22,6 +23,6 @@
+
-
diff --git a/src/CentralPackageVersions/Microsoft.Build.CentralPackageVersions.nuspec b/src/CentralPackageVersions/Microsoft.Build.CentralPackageVersions.nuspec
index d0c94920..484d6b3c 100644
--- a/src/CentralPackageVersions/Microsoft.Build.CentralPackageVersions.nuspec
+++ b/src/CentralPackageVersions/Microsoft.Build.CentralPackageVersions.nuspec
@@ -9,7 +9,7 @@
$copyright$
$projecturl$
LICENSE.txt
- $iconurl$
+ images\MSBuild-NuGet-Icon.png
$tags$
@@ -18,5 +18,6 @@
+
\ No newline at end of file
diff --git a/src/NoTargets/Microsoft.Build.NoTargets.nuspec b/src/NoTargets/Microsoft.Build.NoTargets.nuspec
index d0c94920..484d6b3c 100644
--- a/src/NoTargets/Microsoft.Build.NoTargets.nuspec
+++ b/src/NoTargets/Microsoft.Build.NoTargets.nuspec
@@ -9,7 +9,7 @@
$copyright$
$projecturl$
LICENSE.txt
- $iconurl$
+ images\MSBuild-NuGet-Icon.png
$tags$
@@ -18,5 +18,6 @@
+
\ No newline at end of file
diff --git a/src/Traversal/Microsoft.Build.Traversal.nuspec b/src/Traversal/Microsoft.Build.Traversal.nuspec
index d0c94920..484d6b3c 100644
--- a/src/Traversal/Microsoft.Build.Traversal.nuspec
+++ b/src/Traversal/Microsoft.Build.Traversal.nuspec
@@ -9,7 +9,7 @@
$copyright$
$projecturl$
LICENSE.txt
- $iconurl$
+ images\MSBuild-NuGet-Icon.png
$tags$
@@ -18,5 +18,6 @@
+
\ No newline at end of file