File tree Expand file tree Collapse file tree 11 files changed +25
-16
lines changed
Microsoft.DotNet.PackageValidation.Tests Expand file tree Collapse file tree 11 files changed +25
-16
lines changed Original file line number Diff line number Diff line change 5656 <!-- NU1701 Disable implicit package target fallback, and disable warning for when we explicitly add it (currently needed for
5757 Microsoft.ApplicationInsights) -->
5858 <!-- NU1507 Disable multi-feed check as .NET uses multiple internal feeds intentionally -->
59- <NoWarn >$(NoWarn);NU1701;NU1507;NU1202</NoWarn >
59+ <!-- NU5039 Disable NuGet is unable to find the readme file in the package. -->
60+ <NoWarn >$(NoWarn);NU1701;NU1507;NU1202;NU5039</NoWarn >
6061 <!-- do not enable analyzers on source build-->
6162 <EnforceCodeStyleInBuild Condition =" '$(DotNetBuildSourceOnly)' != 'true'" >true</EnforceCodeStyleInBuild >
6263 <UseSharedCompilation Condition =" '$(DotNetBuildSourceOnly)' == 'true'" >false</UseSharedCompilation >
Original file line number Diff line number Diff line change 271271 </Folder >
272272 <Folder Name =" /src/Workloads/" />
273273 <Folder Name =" /src/Workloads/Manifests/" >
274- <Project Path =" src/Workloads/Manifests/manifest-packages.proj " Type = " C# " />
274+ <Project Path =" src/Workloads/Manifests/manifest-packages.csproj " />
275275 </Folder >
276276 <Folder Name =" /src/Workloads/VSInsertion/" >
277277 <Project Path =" src/Workloads/VSInsertion/workloads.csproj" />
Original file line number Diff line number Diff line change 6363 <ProjectReference Include =" tools\tool_msbuild.csproj" />
6464 <ProjectReference Include =" tools\tool_nuget.csproj" />
6565 <ProjectReference Include =" ..\..\Cli\dotnet\dotnet.csproj" />
66- <ProjectReference Include =" ..\..\Workloads\Manifests\manifest-packages.proj " ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" />
66+ <ProjectReference Include =" ..\..\Workloads\Manifests\manifest-packages.csproj " ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" />
6767 <ProjectReference Include =" ..\..\Tasks\Microsoft.NET.Build.Tasks\Microsoft.NET.Build.Tasks.csproj" ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" />
6868 <ProjectReference Include =" ..\..\Tasks\Microsoft.NET.Build.Extensions.Tasks\Microsoft.NET.Build.Extensions.Tasks.csproj" ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" />
6969 <ProjectReference Include =" ..\..\Resolvers\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj" />
7070 <ProjectReference Include =" $(RepoRoot)src\BuiltInTools\dotnet-watch\dotnet-watch.csproj" ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" Private =" false" />
71- <ProjectReference Include =" $(RepoRoot)src\BuiltInTools\dotnet-format\dotnet-format.csproj" ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" Private =" false" />
71+ <ProjectReference Include =" $(RepoRoot)src\BuiltInTools\dotnet-format\dotnet-format.csproj" ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" Private =" false" />
7272
7373 <ProjectReference Include =" $(RepoRoot)template_feed\*\*.csproj" ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" Private =" false" />
7474 </ItemGroup >
7575
7676 <ItemGroup >
77- <ProjectReference Include =" ..\finalizer\finalizer.csproj" Condition =" '$(OS)' == 'Windows_NT'" ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" Private =" false" />
77+ <ProjectReference Include =" ..\finalizer\finalizer.csproj" Condition =" '$(OS)' == 'Windows_NT'" ReferenceOutputAssembly =" false" SkipGetTargetFrameworkProperties =" true" Private =" false" />
7878 </ItemGroup >
7979
8080 <!-- In .NET product build mode, explicitly build workloads in build pass 2.
Original file line number Diff line number Diff line change 108108 <Copy SourceFiles =" @(ManifestContent)"
109109 DestinationFolder =" $(RedistInstallerLayoutPath)sdk-manifests/%(DestinationPath)" />
110110
111- <MSBuild Projects =" $(RepoRoot)src\Workloads\Manifests\manifest-packages.proj "
111+ <MSBuild Projects =" $(RepoRoot)src\Workloads\Manifests\manifest-packages.csproj "
112112 Targets =" LayoutBuiltinManifests"
113113 Properties =" ManifestDirectory=$(RedistInstallerLayoutPath)sdk-manifests\" />
114114 </Target >
Original file line number Diff line number Diff line change 104104 <Output TaskParameter =" GeneratedGuid" PropertyName =" SdkInstallerUpgradeCode" />
105105 </GenerateGuidFromName >
106106
107- <Exec Command =" powershell -NoProfile -NoLogo $(SdkGenerateMsiPowershellScript) ^
107+ <Exec Command =" powershell -NoProfile -NoLogo -ExecutionPolicy Bypass $(SdkGenerateMsiPowershellScript) ^
108108 '$(IntermediateSdkInstallerOutputPath.TrimEnd('\'))' ^
109109 '$(SdkMSIInstallerFile)' ^
110110 '$(WixRoot)' ^
150150 <Output TaskParameter =" GeneratedGuid" PropertyName =" SdkPlaceholderInstallerUpgradeCode" />
151151 </GenerateGuidFromName >
152152
153- <Exec Command =" powershell -NoProfile -NoLogo $(SdkPlaceholderGenerateMsiPowershellScript) ^
153+ <Exec Command =" powershell -NoProfile -NoLogo -ExecutionPolicy Bypass $(SdkPlaceholderGenerateMsiPowershellScript) ^
154154 '$(SdkPlaceholderMSIInstallerFile)' ^
155155 '$(WixRoot)' ^
156156 '$(SdkBrandName)' ^
186186 DependsOnTargets =" GenerateInstallerLayout;AcquireWix;MsiTargetsSetupInputOutputs;SetupTemplatesMsis"
187187 Inputs =" @(TemplatesMsiComponent);$(TemplatesGenerateMsiPowershellScript)"
188188 Outputs =" %(TemplatesMsiComponent.MSIInstallerFile)" >
189- <Exec Command =" powershell -NoProfile -NoLogo $(TemplatesGenerateMsiPowershellScript) ^
189+ <Exec Command =" powershell -NoProfile -NoLogo -ExecutionPolicy Bypass $(TemplatesGenerateMsiPowershellScript) ^
190190 '%(TemplatesMsiComponent.LayoutPath)' ^
191191 '%(TemplatesMsiComponent.MSIInstallerFile)' ^
192192 '$(WixRoot)' ^
322322 <Output TaskParameter =" GeneratedGuid" PropertyName =" CombinedFrameworkSDKHostInstallerUpgradeCode" />
323323 </GenerateGuidFromName >
324324
325- <Exec Command =" powershell -NoProfile -NoLogo $(SdkGenerateBundlePowershellScript) ^
325+ <Exec Command =" powershell -NoProfile -NoLogo -ExecutionPolicy Bypass $(SdkGenerateBundlePowershellScript) ^
326326 -UpgradePoliciesWxsFile '$(UpgradePoliciesSrcPath)' ^
327327 -WorkloadManifestWxsFile '$(WorkloadManifestsWxsPath)' ^
328328 -CLISDKMSIFile '$(SdkMSIInstallerFile)' ^
Original file line number Diff line number Diff line change 3737 <Using Include =" Microsoft.Build.Utilities.Task" Alias =" Task" />
3838 </ItemGroup >
3939
40+ <!--
41+ Encountered an error about this target being missing when rebuilding within VS.
42+ See: https://github.com/dotnet/msbuild/issues/4303#issuecomment-482345617
43+ -->
44+ <Target Name =" GetTargetPath" />
45+
4046</Project >
Original file line number Diff line number Diff line change 2323
2424 <PropertyGroup >
2525 <!-- NU5128: This package doesn't contain any lib or ref assemblies because it's a tooling package. -->
26- <NoWarn >$(NoWarn);NU5128</NoWarn >
26+ <!-- NU5039: NuGet is unable to find the readme file in the package. -->
27+ <NoWarn >$(NoWarn);NU5128;NU5039</NoWarn >
2728 </PropertyGroup >
2829
2930 <ItemGroup >
Original file line number Diff line number Diff line change 11<Project Sdk =" Microsoft.Build.Traversal" DefaultTargets =" Pack" >
2+
23 <ItemGroup >
34 <ProjectReference Include =" **\*.Manifest.proj" />
45 </ItemGroup >
Original file line number Diff line number Diff line change 2828
2929 <ItemGroup >
3030 <!-- In .NET product build mode in the second build pass, there's no need to build the manifests since they're already downloaded from another vertical -->
31- <ProjectReference Include =" $(RepoRoot)\src\Workloads\Manifests\manifest-packages.proj " ReferenceOutputAssembly =" false" Condition =" '$(DotNetBuild)' != 'true'" />
31+ <ProjectReference Include =" $(RepoRoot)\src\Workloads\Manifests\manifest-packages.csproj " ReferenceOutputAssembly =" false" Condition =" '$(DotNetBuild)' != 'true'" />
3232 </ItemGroup >
3333
3434 <ItemGroup Condition =" '$(BuildWorkloads)' == 'true'" >
Original file line number Diff line number Diff line change 1010
1111 <PropertyGroup >
1212 <ExcludeFromSourceOnlyBuild >true</ExcludeFromSourceOnlyBuild >
13- <NoWarn >$(NoWarn);NU5125</NoWarn >
1413
15- <!-- Don't warn about long filenames in packages, we bundle test assets that have long paths
14+ <!-- NU5125 The licenseUrl element is being replaced by the license element. -->
15+ <!-- NU5123 Don't warn about long filenames in packages, we bundle test assets that have long paths
1616 (ie HelloWorldWithSubDirs) -->
17- <NoWarn >$(NoWarn);NU5123</NoWarn >
17+ <NoWarn >$(NoWarn);NU5125; NU5123</NoWarn >
1818
1919 <GenerateProgramFile >false</GenerateProgramFile >
2020
You can’t perform that action at this time.
0 commit comments