Get rid of nuspec and other clean up items

Author: liliankasem

.gitignore

@@ -1,6 +1,7 @@
 bin
 obj
 out
+nupkg
 csx
 .vs
 edge
@@ -28,6 +29,7 @@ artifacts/
 /src/Azure.Functions.Cli/Properties/launchSettings.json
 launchSettings.json
 publish-env
+*.binlog
 
 # MacOS related
 .DS_Store

Directory.Build.props

@@ -12,7 +12,6 @@
     <ArtifactsPublishOutputName>pub</ArtifactsPublishOutputName>
     <ArtifactsPackageOutputName>pkg</ArtifactsPackageOutputName>
     <IsPackable>false</IsPackable>
-    <PackageOutputPath>$(RepoRoot)nupkg/</PackageOutputPath>
   </PropertyGroup>
 
   <Import Project="$(RepoEngRoot)Directory.Build.Common.props" />

build/BuildSteps.cs

@@ -134,6 +134,7 @@ private static void ExecuteDotnetPublish(string outputPath, string rid, string t
             Shell.Run("dotnet", $"publish {Settings.ProjectFile} " +
                                 $"/p:BuildNumber=\"{Settings.BuildNumber}\" " +
                                 $"/p:CommitHash=\"{Settings.CommitId}\" " +
+                                $"/p:ContinuousIntegrationBuild=\"true\" " +
                                 (string.IsNullOrEmpty(Settings.IntegrationBuildNumber) ? string.Empty : $"/p:IntegrationBuildNumber=\"{Settings.IntegrationBuildNumber}\" ") +
                                 $"-o {outputPath} -c Release -f {targetFramework}  --self-contained" +
                                 (string.IsNullOrEmpty(rid) ? string.Empty : $" -r {rid}"));

eng/Directory.Build.Common.props

@@ -11,7 +11,6 @@
     <Authors>Microsoft</Authors>
     <Title>Azure Functions CLI</Title>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-    <PackageLicenseUrl>http://www.microsoft.com/web/webpi/eula/aspnetcomponent_rtw_enu.htm</PackageLicenseUrl>
     <RepositoryUrl>https://github.com/Azure/azure-functions-core-tools</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
@@ -25,7 +24,8 @@
     <NoWarn>$(NoWarn);NU1507</NoWarn>
   </PropertyGroup>
 
-  <!-- enable this in a new PR and fix all warnings-->
+  <!-- uncomment this in a new PR and fix all errors -->
+  <!-- https://github.com/Azure/azure-functions-core-tools/issues/4320 -->
   <!-- <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup> -->

eng/Directory.Packages.props

@@ -47,8 +47,6 @@
   </ItemGroup>
 
   <!-- test projects -->
-  <!-- <ItemGroup Condition="'$(IsTestProject)' == 'true'">
-     -->
   <ItemGroup>
     <PackageVersion Include="Azure.Data.Tables" Version="12.9.0" />
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.21.2" />

src/Cli/func/Azure.Functions.Cli.csproj

@@ -4,34 +4,29 @@
     <AssemblyName>func</AssemblyName>
     <RuntimeIdentifiers>win-x64;win-x86;win-arm64;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <Nullable>disable</Nullable>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
   </PropertyGroup>
 
   <PropertyGroup>
-    <CommitHash Condition="$(CommitHash) == ''">N/A</CommitHash>
-    <IntegrationBuildNumberInfo Condition="$(IntegrationBuildNumber) != ''">Integration build number: $(IntegrationBuildNumber)</IntegrationBuildNumberInfo>
-    <InformationalVersion>$(FileVersion) Commit hash: $(CommitHash) $(IntegrationBuildNumberInfo)</InformationalVersion>
-    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
-    <NuspecFile>Azure.Functions.Cli.nuspec</NuspecFile>
-    <NuspecProperties>ßconfiguration=$(Configuration);targetFramework=$(TargetFramework);version=$(Version)</NuspecProperties>
+    <PackAsTool>true</PackAsTool>
+    <ToolCommandName>func</ToolCommandName>
     <PackageId>Microsoft.Azure.Functions.CoreTools</PackageId>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'win-x64' OR '$(RuntimeIdentifier)' == 'win-x86'">
+    <PublishReadyToRun>false</PublishReadyToRun>
+    <PublishReadyToRunShowWarnings>false</PublishReadyToRunShowWarnings>
+  </PropertyGroup>
+
   <PropertyGroup>
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">1</BuildNumber>
     <MajorMinorProductVersion>4.0</MajorMinorProductVersion>
     <Version>$(MajorMinorProductVersion).$(BuildNumber)</Version>
     <AssemblyVersion>$(MajorMinorProductVersion).$(BuildNumber)</AssemblyVersion>
     <FileVersion>$(MajorMinorProductVersion).$(BuildNumber)</FileVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <PackAsTool>true</PackAsTool>
-    <ToolCommandName>func</ToolCommandName>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'win-x64' OR '$(RuntimeIdentifier)' == 'win-x86'">
-    <PublishReadyToRun>false</PublishReadyToRun>
-    <PublishReadyToRunShowWarnings>false</PublishReadyToRunShowWarnings>
+    <CommitHash Condition="$(CommitHash) == ''">N/A</CommitHash>
+    <IntegrationBuildNumberInfo Condition="$(IntegrationBuildNumber) != ''">Integration build number: $(IntegrationBuildNumber)</IntegrationBuildNumberInfo>
+    <InformationalVersion>$(FileVersion) Commit hash: $(CommitHash) $(IntegrationBuildNumberInfo)</InformationalVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -299,6 +294,12 @@
     <PackageReference Include="Microsoft.Azure.Functions.PythonWorker" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="$(RepoRoot)out\pub\Azure.Functions.Cli\$(Configuration)_$(TargetFramework)\tools\python\packapp\__main__.py" Pack="true" PackagePath="content" />
+    <None Include="$(RepoRoot)out\pub\Azure.Functions.Cli\$(Configuration)_$(TargetFramework)\tools\python\packapp\__main__.py" Pack="true" PackagePath="contentFiles/any/$(TargetFramework)" />
+    <None Include="$(RepoRoot)out\pub\Azure.Functions.Cli\$(Configuration)_$(TargetFramework)\**\*" Pack="true" PackagePath="tools/$(TargetFramework)/any" />
+  </ItemGroup>
+
   <Target Name="ExcludeWorkersFromReadyToRun">
     <CreateItem Include="%(None.Filename)%(None.Extension)"
       Condition="$([System.String]::new('%(None.TargetPath)').StartsWith('workers'))"

src/Cli/func/Azure.Functions.Cli.nuspec

@@ -12,7 +12,7 @@
     <CETCompat>false</CETCompat>
     <OptimizationPreference>Speed</OptimizationPreference>
     <AssemblyName>func</AssemblyName>
-	  <IlcExportUnmanagedEntrypoints>true</IlcExportUnmanagedEntrypoints>
+    <IlcExportUnmanagedEntrypoints>true</IlcExportUnmanagedEntrypoints>
   </PropertyGroup>
 
   <PropertyGroup>

src/CoreToolsHost/CoreToolsHost.csproj

@@ -3,5 +3,6 @@
 
   <PropertyGroup>
     <IsPackable>true</IsPackable>
+    <PackageOutputPath>$(RepoRoot)nupkg</PackageOutputPath>
   </PropertyGroup>
 </Project>