Renamed manifest-packages.proj to .csproj for VS compatibility. Added NoWarn for NU5039. Added -ExecutionPolicy Bypass for calls to PowerShell. Added blank GetTargetPath to sdk-tasks.csproj. Other minor cleanup.

Author: MiYanni

Directory.Build.props

@@ -55,7 +55,8 @@
     <!-- NU1701 Disable implicit package target fallback, and disable warning for when we explicitly add it (currently needed for
          Microsoft.ApplicationInsights) -->
     <!-- NU1507 Disable multi-feed check as .NET uses multiple internal feeds intentionally -->
-    <NoWarn>$(NoWarn);NU1701;NU1507;NU1202</NoWarn>
+    <!-- NU5039 Disable NuGet is unable to find the readme file in the package. -->
+    <NoWarn>$(NoWarn);NU1701;NU1507;NU1202;NU5039</NoWarn>
     <!-- do not enable analyzers on source build-->
     <EnforceCodeStyleInBuild Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</EnforceCodeStyleInBuild>
     <UseSharedCompilation Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</UseSharedCompilation>

sdk.slnx

@@ -271,7 +271,7 @@
   </Folder>
   <Folder Name="/src/Workloads/" />
   <Folder Name="/src/Workloads/Manifests/">
-    <Project Path="src/Workloads/Manifests/manifest-packages.proj" Type="C#" />
+    <Project Path="src/Workloads/Manifests/manifest-packages.csproj" />
   </Folder>
   <Folder Name="/src/Workloads/VSInsertion/">
     <Project Path="src/Workloads/VSInsertion/workloads.csproj" />

src/Layout/redist/redist.csproj

@@ -63,18 +63,18 @@
     <ProjectReference Include="tools\tool_msbuild.csproj" />
     <ProjectReference Include="tools\tool_nuget.csproj" />
     <ProjectReference Include="..\..\Cli\dotnet\dotnet.csproj" />
-    <ProjectReference Include="..\..\Workloads\Manifests\manifest-packages.proj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
+    <ProjectReference Include="..\..\Workloads\Manifests\manifest-packages.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
     <ProjectReference Include="..\..\Tasks\Microsoft.NET.Build.Tasks\Microsoft.NET.Build.Tasks.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
     <ProjectReference Include="..\..\Tasks\Microsoft.NET.Build.Extensions.Tasks\Microsoft.NET.Build.Extensions.Tasks.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
     <ProjectReference Include="..\..\Resolvers\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj" />
     <ProjectReference Include="$(RepoRoot)src\BuiltInTools\dotnet-watch\dotnet-watch.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
-    <ProjectReference Include="$(RepoRoot)src\BuiltInTools\dotnet-format\dotnet-format.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true"  Private="false" />
+    <ProjectReference Include="$(RepoRoot)src\BuiltInTools\dotnet-format\dotnet-format.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
 
     <ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\finalizer\finalizer.csproj" Condition="'$(OS)' == 'Windows_NT'" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true"  Private="false" />
+    <ProjectReference Include="..\finalizer\finalizer.csproj" Condition="'$(OS)' == 'Windows_NT'" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
   </ItemGroup>
 
   <!-- In .NET product build mode, explicitly build workloads in build pass 2.

src/Layout/redist/targets/BundledManifests.targets

@@ -108,7 +108,7 @@
     <Copy SourceFiles="@(ManifestContent)"
           DestinationFolder="$(RedistInstallerLayoutPath)sdk-manifests/%(DestinationPath)" />
 
-    <MSBuild Projects="$(RepoRoot)src\Workloads\Manifests\manifest-packages.proj"
+    <MSBuild Projects="$(RepoRoot)src\Workloads\Manifests\manifest-packages.csproj"
              Targets="LayoutBuiltinManifests"
              Properties="ManifestDirectory=$(RedistInstallerLayoutPath)sdk-manifests\" />
   </Target>

src/Layout/redist/targets/GenerateMSIs.targets

@@ -104,7 +104,7 @@
       <Output TaskParameter="GeneratedGuid" PropertyName="SdkInstallerUpgradeCode" />
     </GenerateGuidFromName>
 
-    <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateMsiPowershellScript) ^
+    <Exec Command="powershell -NoProfile -NoLogo -ExecutionPolicy Bypass $(SdkGenerateMsiPowershellScript) ^
                       '$(IntermediateSdkInstallerOutputPath.TrimEnd('\'))' ^
                       '$(SdkMSIInstallerFile)' ^
                       '$(WixRoot)' ^
@@ -150,7 +150,7 @@
       <Output TaskParameter="GeneratedGuid" PropertyName="SdkPlaceholderInstallerUpgradeCode" />
     </GenerateGuidFromName>
 
-    <Exec Command="powershell -NoProfile -NoLogo $(SdkPlaceholderGenerateMsiPowershellScript) ^
+    <Exec Command="powershell -NoProfile -NoLogo -ExecutionPolicy Bypass $(SdkPlaceholderGenerateMsiPowershellScript) ^
                       '$(SdkPlaceholderMSIInstallerFile)' ^
                       '$(WixRoot)' ^
                       '$(SdkBrandName)' ^
@@ -186,7 +186,7 @@
           DependsOnTargets="GenerateInstallerLayout;AcquireWix;MsiTargetsSetupInputOutputs;SetupTemplatesMsis"
           Inputs="@(TemplatesMsiComponent);$(TemplatesGenerateMsiPowershellScript)"
           Outputs="%(TemplatesMsiComponent.MSIInstallerFile)">
-    <Exec Command="powershell -NoProfile -NoLogo $(TemplatesGenerateMsiPowershellScript) ^
+    <Exec Command="powershell -NoProfile -NoLogo -ExecutionPolicy Bypass $(TemplatesGenerateMsiPowershellScript) ^
                       '%(TemplatesMsiComponent.LayoutPath)' ^
                       '%(TemplatesMsiComponent.MSIInstallerFile)' ^
                       '$(WixRoot)' ^
@@ -322,7 +322,7 @@
       <Output TaskParameter="GeneratedGuid" PropertyName="CombinedFrameworkSDKHostInstallerUpgradeCode" />
     </GenerateGuidFromName>
 
-    <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateBundlePowershellScript) ^
+    <Exec Command="powershell -NoProfile -NoLogo -ExecutionPolicy Bypass $(SdkGenerateBundlePowershellScript) ^
                       -UpgradePoliciesWxsFile '$(UpgradePoliciesSrcPath)' ^
                       -WorkloadManifestWxsFile '$(WorkloadManifestsWxsPath)' ^
                       -CLISDKMSIFile '$(SdkMSIInstallerFile)' ^

src/Tasks/sdk-tasks/sdk-tasks.csproj

@@ -37,4 +37,6 @@
     <Using Include="Microsoft.Build.Utilities.Task" Alias="Task" />
   </ItemGroup>
 
+  <Target Name="GetTargetPath" />
+
 </Project>

src/Workloads/Manifests/Directory.Build.props

@@ -23,7 +23,8 @@
 
   <PropertyGroup>
     <!-- NU5128: This package doesn't contain any lib or ref assemblies because it's a tooling package. -->
-    <NoWarn>$(NoWarn);NU5128</NoWarn>
+    <!-- NU5039: NuGet is unable to find the readme file in the package. -->
+    <NoWarn>$(NoWarn);NU5128;NU5039</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

src/Workloads/Manifests/manifest-packages.proj renamed to src/Workloads/Manifests/manifest-packages.csproj

@@ -28,7 +28,7 @@
 
   <ItemGroup>
     <!-- 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 -->
-    <ProjectReference Include="$(RepoRoot)\src\Workloads\Manifests\manifest-packages.proj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuild)' != 'true'" />
+    <ProjectReference Include="$(RepoRoot)\src\Workloads\Manifests\manifest-packages.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuild)' != 'true'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BuildWorkloads)' == 'true'">

src/Workloads/VSInsertion/workloads.csproj

@@ -10,11 +10,11 @@
 
   <PropertyGroup>
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
-    <NoWarn>$(NoWarn);NU5125</NoWarn>
 
-    <!-- Don't warn about long filenames in packages, we bundle test assets that have long paths
+    <!-- NU5125 The licenseUrl element is being replaced by the license element. -->
+    <!-- NU5123 Don't warn about long filenames in packages, we bundle test assets that have long paths
          (ie HelloWorldWithSubDirs) -->
-    <NoWarn>$(NoWarn);NU5123</NoWarn>
+    <NoWarn>$(NoWarn);NU5125;NU5123</NoWarn>
 
     <GenerateProgramFile>false</GenerateProgramFile>