Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

Expand Down Expand Up @@ -76,5 +75,5 @@
<PropertyGroup>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
</PropertyGroup>
</Project>

</Project>
9 changes: 5 additions & 4 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
<!-- Include Common.globalconfig for non-deprecated projects-->
<EditorConfigFiles Include="$(MSBuildThisFileDirectory)eng/Common.globalconfig" />
</ItemGroup>

<!-- Test Project Global Analyzer Config -->
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
<!-- Include Common.Test.globalconfig for Test projects-->
<EditorConfigFiles Include="$(MSBuildThisFileDirectory)eng/Common.Test.globalconfig" />
</ItemGroup>

<PropertyGroup>
<CentralPackagesFile>$(MSBuildThisFileDirectory)eng/Packages.props</CentralPackagesFile>
</PropertyGroup>
Expand All @@ -31,12 +31,13 @@
<Target Name="DeleteDevPackage" AfterTargets="GenerateNuspec">
<!-- If package just built was already in global packages folder, delete it. This helps support a local dev cycle where you are consuming
a package from another repo without having to update the package version each time. -->

<PropertyGroup>
<_PackageFolderInGlobalPackages>$(NuGetPackageRoot)$(PackageId.ToLowerInvariant())\$(PackageVersion)</_PackageFolderInGlobalPackages>
</PropertyGroup>

<RemoveDir Directories="$(_PackageFolderInGlobalPackages)"
Condition="Exists('$(_PackageFolderInGlobalPackages)')" />
</Target>
</Project>

</Project>
4 changes: 2 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
Expand All @@ -8,4 +7,5 @@
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>

</configuration>
2 changes: 1 addition & 1 deletion PublishToBlob.proj
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
SkipCreateManifest="false" />
</Target>

</Project>
</Project>
1 change: 0 additions & 1 deletion documentation/wiki/MSBuild-Tips-&-Tricks.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ Example:
Create this file (Custom.props) in `C:\Users\username\AppData\Local\Microsoft\MSBuild\Current\Microsoft.Common.targets\ImportAfter`:

```
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<MyCustomProperty>Value!</MyCustomProperty>
Expand Down
4 changes: 2 additions & 2 deletions eng/AfterSigning.targets
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project>
<Target Name="CopyAMD64Symbols" Condition="'$(OfficialBuild)' == 'true' AND '$(ArcadeBuildFromSource)' != 'true'" BeforeTargets="Build">
<Copy
<Copy
SourceFiles="$(ArtifactsBinDir)MSBuild\x64\Release\net472\MSBuild.pdb"
DestinationFolder="$(ArtifactsSymStoreDirectory)\MSBuild\net472\amd64"
/>
<Copy
<Copy
SourceFiles="$(ArtifactsBinDir)MSBuildTaskHost\x64\Release\net35\MSBuildTaskHost.pdb"
DestinationFolder="$(ArtifactsSymStoreDirectory)\MSBuildTaskHost\net35\amd64"
/>
Expand Down
3 changes: 2 additions & 1 deletion eng/BootStrapMSBuild.targets
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,5 @@
https://github.com/dotnet/msbuild/issues/6566 -->
<Touch Files="$(BootstrapDestination)\DisableWorkloadResolver.sentinel" AlwaysCreate="true" />
</Target>
</Project>

</Project>
3 changes: 1 addition & 2 deletions eng/Build.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>

Expand All @@ -14,4 +13,4 @@
<ProjectToBuild Include="$(RepoRoot)MSBuild.sln" />
</ItemGroup>

</Project>
</Project>
3 changes: 2 additions & 1 deletion eng/Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@
<PackageReference Update="xunit.console" Version="$(XUnitVersion)" />
<PackageReference Update="xunit.core" Version="$(XUnitVersion)" />
</ItemGroup>
</Project>

</Project>
6 changes: 2 additions & 4 deletions eng/ProducesNoOutput.Imports.props
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<Project>
<PropertyGroup>
<MSBuildTargetsFilePath>$(MSBuildToolsPath)\Microsoft.CSharp.targets</MSBuildTargetsFilePath>

<IsPackable>false</IsPackable>

<DeterministicSourcePaths>false</DeterministicSourcePaths>
<MSBuildTargetsFilePath>$(MSBuildToolsPath)\Microsoft.CSharp.targets</MSBuildTargetsFilePath>
</PropertyGroup>

<Import Project="$(MSBuildTargetsFilePath)" />
Expand All @@ -31,4 +29,4 @@
<Target Name="GetBuildVersion" /> <!-- For Packages projects, which use GetNuGetPackageVersionEx which depends on GetBuildVersion -->
<Target Name="Pack" />

</Project>
</Project>
2 changes: 1 addition & 1 deletion eng/ProducesNoOutput.Settings.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
<LanguageTargets>$(MSBuildThisFileDirectory)ProducesNoOutput.Imports.props</LanguageTargets>
<ProducesNoOutput>true</ProducesNoOutput>
</PropertyGroup>
</Project>
</Project>
1 change: 0 additions & 1 deletion eng/Publishing.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<PublishingVersion>3</PublishingVersion>
Expand Down
3 changes: 2 additions & 1 deletion eng/Signing.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
<ItemGroup>
<ItemsToSign Include="$(VisualStudioSetupInsertionPath)Microsoft.Build.UnGAC.exe" />
</ItemGroup>

<PropertyGroup>
<UseDotNetCertificate>true</UseDotNetCertificate>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion eng/SourceBuild.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
</PropertyGroup>
</Target>

</Project>
</Project>
2 changes: 1 addition & 1 deletion eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
<IgnorePatterns>
<UsagePattern IdentityGlob="*/*" />
</IgnorePatterns>
</UsageData>
</UsageData>
3 changes: 1 addition & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22054.3">
Expand All @@ -19,4 +18,4 @@
<Sha>98018d5a808e5167a4ce5e81dc6513382676d4c9</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
</Dependencies>
3 changes: 1 addition & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<PropertyGroup>
Expand Down Expand Up @@ -53,4 +52,4 @@
<FileVersion>$(VersionPrefix).$(FileVersion.Split('.')[3])</FileVersion>
</PropertyGroup>
</Target>
</Project>
</Project>
3 changes: 2 additions & 1 deletion eng/common/helixpublish.proj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/common/internal/Directory.Build.props

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/common/internal/Tools.csproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions eng/common/sdl/NuGet.config

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions eng/common/sdl/packages.config

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/dependabot/Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
<GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<PropertyGroup>
<NuGetCommandLinePackageVersion>4.1.0</NuGetCommandLinePackageVersion>
</PropertyGroup>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(FeatureMSIORedist)' == 'true'" />
Expand Down Expand Up @@ -105,4 +105,5 @@
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
</Project>

</Project>
15 changes: 8 additions & 7 deletions src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<AssemblyName>Microsoft.Build.Engine.UnitTests</AssemblyName>

<DefineConstants>$(DefineConstants);MICROSOFT_BUILD_ENGINE_UNITTESTS</DefineConstants>

<!-- Define a constant so we can skip tests that require MSBuildTaskHost -->
<DefineConstants Condition="'$(MSBuildRuntimeType)' == 'Core' or '$(MonoBuild)' == 'true'">$(DefineConstants);NO_MSBUILDTASKHOST</DefineConstants>

Expand Down Expand Up @@ -132,14 +132,14 @@
<!-- In TypeLoader, the following logic is used for loading assemblies on .NET Core:
- if the simple name of the assembly exists in the same folder as msbuild.exe, then that assembly gets loaded, indifferent of the user specified path
- otherwise, the assembly from the user specified path is loaded, if it exists.

So the custom tasks we are testing can't be in test output folder, because on .NET Core that would affect the loading behavior. So this
target puts them in subfolders of the test output folder instead.
target puts them in subfolders of the test output folder instead.
-->

<Error Condition="'@(PortableTaskResolvedProjectReferencePath)' == ''" Text="Couldn't find PortableTaskResolvedProjectReferencePath item for PortableTask" />
<Error Condition="'@(TaskWithDependencyResolvedProjectReferencePath)' == ''" Text="Couldn't find TaskWithDependencyResolvedProjectReferencePath item for TaskWithDependency" />

<PropertyGroup>
<PortableTaskOutputPath>@(PortableTaskResolvedProjectReferencePath->'%(RootDir)%(Directory)')</PortableTaskOutputPath>
<TaskWithDependencyOutputPath>@(TaskWithDependencyResolvedProjectReferencePath->'%(RootDir)%(Directory)')</TaskWithDependencyOutputPath>
Expand All @@ -151,16 +151,17 @@
<TaskWithDependencyContentContent Include="$(TaskWithDependencyOutputPath)*.*" />
<Content Include="@(TaskWithDependencyContentContent)" Link="TaskWithDependency\%(TaskWithDependencyContentContent.Filename)%(TaskWithDependencyContentContent.Extension)" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

</Target>

<ItemDefinitionGroup>
<Content>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemDefinitionGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
</Project>

</Project>
3 changes: 2 additions & 1 deletion src/Build/Microsoft.Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -779,4 +779,5 @@
<ItemGroup>
<Compile Remove="Collections\RetrievableEntryHashSet\Originals\*" />
</ItemGroup>
</Project>

</Project>
5 changes: 2 additions & 3 deletions src/Build/Resources/Strings.resx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<root>
<!--
Microsoft ResX Schema

Expand Down Expand Up @@ -1899,4 +1898,4 @@ Utilization: {0} Average Utilization: {1:###.0}</value>
<data name="ProxyRequestNotScheduledOnInprocNode" xml:space="preserve">
<value>MSB4274: Disabling the inproc node leads to performance degradation when using project cache plugins that emit proxy build requests.</value>
</data>
</root>
</root>
3 changes: 1 addition & 2 deletions src/Build/Resources/xlf/Strings.cs.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/Build/Resources/xlf/Strings.de.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/Build/Resources/xlf/Strings.en.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/Build/Resources/xlf/Strings.es.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/Build/Resources/xlf/Strings.fr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/Build/Resources/xlf/Strings.it.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/Build/Resources/xlf/Strings.ja.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/Build/Resources/xlf/Strings.ko.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading