Fixed Project Metadata

.azdo/pipelines/ci-pipeline.yml

@@ -22,36 +22,25 @@ stages:
       pool:
         vmImage: $(WindowsVmImage)
       steps:
-      - template: ./jobs/checkCode.yml
+      - template: ./steps/checkCode.yml
 
     - job: BuildTestPack
       pool:
         vmImage: $(VmImage)
       steps:
-      - template: ./jobs/build.yml
+      - template: ./steps/build.yml
 
-      - bash: |
-          TRIMMED_VERSION=`echo $(ahds-toolkit-release-major).$(ahds-toolkit-release-minor).$(ahds-toolkit-release-patch).$(ahds-toolkit-release-revision) | sed 's/\.*$//g'`
-          echo "##vso[task.setvariable variable=ReleaseVersion;isOutput=true]$TRIMMED_VERSION"
-          echo "##vso[task.setvariable variable=ReleaseFileVersion]$(ahds-toolkit-release-major).$(ahds-toolkit-release-minor).$(ahds-toolkit-release-patch).$(Build.BuildId)"
-          echo "##vso[task.setvariable variable=ReleaseAssemblyVersion]$(ahds-toolkit-release-major).0.0.0"
-
-          TRIMMED_VERSION=`echo $(ahds-toolkit-prerelease-major).$(ahds-toolkit-prerelease-minor).$(ahds-toolkit-prerelease-patch)-prerelease.$(ahds-toolkit-prerelease-revision) | sed 's/\.*$//g'`
-          echo "##vso[task.setvariable variable=PrereleaseVersion;isOutput=true]$TRIMMED_VERSION"
-          echo "##vso[task.setvariable variable=PrereleaseFileVersion]$(ahds-toolkit-prerelease-major).$(ahds-toolkit-prerelease-minor).$(ahds-toolkit-prerelease-patch).$(Build.BuildId)"
-          echo "##vso[task.setvariable variable=PrereleaseAssemblyVersion]$(ahds-toolkit-prerelease-major).0.0.0"
-        name: SetVariables
-        displayName: Set Version Variables
+      - template: ./steps/versionVariables.yml
 
-      - template: ./jobs/pack.yml
+      - template: ./steps/pack.yml
         parameters:
           PackageArtifactName: ReleasePackages
           Version: $(SetVariables.ReleaseVersion)
           AssemblyVersion: $(ReleaseAssemblyVersion)
           FileVersion: $(ReleaseFileVersion)
 
       - ${{if and(in(variables['Build.Reason'], 'Manual', ''), eq(variables['System.TeamProject'], 'AzureHealthDataServicesToolkit'))}}:
-        - template: ./jobs/pack.yml
+        - template: ./steps/pack.yml
           parameters:
             PackageArtifactName: PrereleasePackages
             Version: $(SetVariables.PrereleaseVersion)
@@ -63,13 +52,11 @@ stages:
     - template: ./stages/release.yml
       parameters:
         PackageArtifactName: PrereleasePackages
-        GithubReleseTag: $[stageDependencies.Build.BuildTestPack.outputs['SetVariables.PrereleaseVersion']]
         DevOpsFeedID: AzureHealthDataServicesToolkit/AzureHealthDataServicesToolkitInternal
         IsPrerelease: true
 
     - template: ./stages/release.yml
       parameters:
         PackageArtifactName: ReleasePackages
-        GithubReleseTag: $[stageDependencies.Build.BuildTestPack.outputs['SetVariables.ReleaseVersion']]
         DevOpsFeedID: AzureHealthDataServicesToolkit/AzureHealthDataServicesToolkitInternal
         IsPrerelease: false

.azdo/pipelines/stages/release.yml

@@ -1,7 +1,6 @@
 parameters:
   - name: PackageArtifactName
   - name: DevOpsFeedID
-  - name: GithubReleseTag
   - name: IsPrerelease
     type: boolean
     default: true
@@ -47,7 +46,7 @@ stages:
         pool:
           vmImage: $(WindowsVmImage)
         steps:
-        - template: ../jobs/analyze.yml
+        - template: ../steps/analyze.yml
           parameters:
             PackageArtifactName: ${{ parameters.PackageArtifactName }}
 
@@ -118,22 +117,30 @@ stages:
       environment: github
       pool:
         vmImage: $(VmImage)
+      variables:
+        ${{ if eq( parameters['IsPrerelease'], true) }}:
+          PackageVersion: $(SetVariables.PrereleaseVersion)
+        ${{ else }}:
+          PackageVersion: $(SetVariables.ReleaseVersion)
       strategy:
         runOnce:
           deploy:
             steps:
             - download: current
               artifact: '${{ parameters.PackageArtifactName }}-signed'
 
+            - template: ../steps/versionVariables.yml
+
             - task: GithubRelease@1 
               displayName: 'Create GitHub Release'
               inputs:
                 gitHubConnection: 'Github (${{ parameters.RepositoryName }})'
                 repositoryName: ${{ parameters.RepositoryName }}
                 action: 'create'
                 tagSource: userSpecifiedTag
-                tag: release/${{ parameters.GithubReleseTag }}
-                title: ${{ parameters.PackagePrefix }} ${{ parameters.GithubReleseTag }}
+
+                tag: release/$(PackageVersion)
+                title: ${{ parameters.PackagePrefix }} $(PackageVersion)
                 isPreRelease: ${{ parameters.IsPrerelease }}
                 assets: |
                   $(Pipeline.Workspace)/${{ parameters.PackageArtifactName }}-signed/*.nupkg

.azdo/pipelines/jobs/build.yml → .azdo/pipelines/steps/build.yml

@@ -4,7 +4,7 @@ steps:
   displayName: 'Install dotnet 6.0.x agent tools dir'
   inputs:
     packageType: 'sdk'
-    version: '6.0.x'
+    useGlobalJson: true
     installationPath: $(Agent.ToolsDirectory)/dotnet
 
 - task: DotNetCoreCLI@2

.azdo/pipelines/jobs/checkCode.yml → .azdo/pipelines/steps/checkCode.yml

@@ -4,7 +4,7 @@ steps:
   displayName: 'Install dotnet 6.0.x agent tools dir'
   inputs:
     packageType: 'sdk'
-    version: '6.0.x'
+    useGlobalJson: true
     installationPath: $(Agent.ToolsDirectory)/dotnet
 
 - task: DotNetCoreCLI@2
@@ -15,14 +15,14 @@ steps:
     arguments: 'update -g dotnet-format'
 
 - task: DotNetCoreCLI@2
-  displayName: 'Lint Toolkit and Samples'
+  displayName: 'Lint Toolkit'
   inputs:
     command: 'custom'
     custom: 'format'
     arguments: 'Microsoft.AzureHealth.DataServices.Toolkit.sln --verify-no-changes --verbosity diagnostic'
 
 - task: DotNetCoreCLI@2
-  displayName: 'Lint Toolkit'
+  displayName: 'Lint Samples'
   inputs:
     command: 'custom'
     custom: 'format'

.azdo/pipelines/jobs/pack.yml → .azdo/pipelines/steps/pack.yml

@@ -7,7 +7,7 @@ parameters:
 steps:
   # Script is used here so we can pass custom parameters to dotnet pack
   - task: Bash@3
-    displayName: Pack and Publish ${{ parameters.Version }}
+    displayName: Pack
     inputs:
       targetType: 'inline'
       script: |
@@ -24,7 +24,7 @@ steps:
       NOTES: ${{ format('The change log for this version is made available at https://github.com/microsoft/azure-health-data-services-toolkit/releases/tag/release%2F{0}', parameters.Version) }}
 
   - task: PublishPipelineArtifact@1
-    displayName: Publish packages
+    displayName: Publish Artifacts
     inputs:
       targetPath: ${{ format('$(Build.ArtifactStagingDirectory)/{0}/{1}', parameters.PackageArtifactName, parameters.Version) }}
       artifactName: ${{ parameters.PackageArtifactName }}

.azdo/pipelines/steps/versionVariables.yml

@@ -0,0 +1,13 @@
+steps:
+  - bash: |
+      TRIMMED_VERSION=`echo $(ahds-toolkit-release-major).$(ahds-toolkit-release-minor).$(ahds-toolkit-release-patch).$(ahds-toolkit-release-revision) | sed 's/\.*$//g'`
+      echo "##vso[task.setvariable variable=ReleaseVersion;isOutput=true]$TRIMMED_VERSION"
+      echo "##vso[task.setvariable variable=ReleaseFileVersion]$(ahds-toolkit-release-major).$(ahds-toolkit-release-minor).$(ahds-toolkit-release-patch).$(Build.BuildId)"
+      echo "##vso[task.setvariable variable=ReleaseAssemblyVersion]$(ahds-toolkit-release-major).0.0.0"
+
+      TRIMMED_VERSION=`echo $(ahds-toolkit-prerelease-major).$(ahds-toolkit-prerelease-minor).$(ahds-toolkit-prerelease-patch)-prerelease.$(ahds-toolkit-prerelease-revision) | sed 's/\.*$//g'`
+      echo "##vso[task.setvariable variable=PrereleaseVersion;isOutput=true]$TRIMMED_VERSION"
+      echo "##vso[task.setvariable variable=PrereleaseFileVersion]$(ahds-toolkit-prerelease-major).$(ahds-toolkit-prerelease-minor).$(ahds-toolkit-prerelease-patch).$(Build.BuildId)"
+      echo "##vso[task.setvariable variable=PrereleaseAssemblyVersion]$(ahds-toolkit-prerelease-major).0.0.0"
+    name: SetVariables
+    displayName: Set Version Variables

src/Directory.Build.props

@@ -0,0 +1,50 @@
+<Project>
+
+  <!-- Nuget related properties.-->
+  <PropertyGroup>
+    <Authors>Microsoft</Authors>
+    <Company>Microsoft Corporation</Company>
+    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    <Product>Microsoft(R) Azure Health Data Services Toolkit</Product>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <CurrentDate>$([System.DateTime]::Now.ToString(yyyyMMdd))</CurrentDate>
+    <PackageIcon>Icon.png</PackageIcon>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <RepositoryUrl>https://github.com/microsoft/azure-health-data-services-toolkit/</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/microsoft/azure-health-data-services-toolkit/</PackageProjectUrl>
+
+    <DebugType>Portable</DebugType>
+    <Deterministic>true</Deterministic>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <HighEntropyVA>true</HighEntropyVA>
+    <LangVersion>latest</LangVersion>
+    <IsPackable>true</IsPackable>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <RootNamespace>Microsoft.AzureHealth.DataServices</RootNamespace>
+
+    <AnalysisLevel>latest</AnalysisLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+
+    <TargetFramework>net6.0</TargetFramework>
+    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    <Optimize Condition="'$(Configuration)'=='Release'">true</Optimize>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\.editorconfig" Link=".editorconfig" />
+    <None Include="Icon.png" Pack="true" PackagePath="\" />
+    <None Include="README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers" />
+  </ItemGroup>
+
+</Project>

src/Microsoft.AzureHealth.DataServices.Caching/Microsoft.AzureHealth.DataServices.Caching.csproj

@@ -1,57 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Company>Microsoft Corporation</Company>
-    <Product>Microsoft(R) Azure Health Data Services Toolkit</Product>
-    <Description>Caching library to assist with creating custom operations for Azure Health Data Services.</Description>
-    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-    <NeutralLanguage>en-US</NeutralLanguage>
-    <CurrentDate>$([System.DateTime]::Now.ToString(yyyyMMdd))</CurrentDate>
-    <Authors>Microsoft</Authors>
-
-    <TargetFramework>net6.0</TargetFramework>
-    <AssemblyName>Microsoft.AzureHealth.DataServices.Caching</AssemblyName>
-    <ImplicitUsings>enable</ImplicitUsings>
-
     <Title>Azure Health Data Services Toolkit Caching Library</Title>
     <PackageId>Microsoft.AzureHealth.DataServices.Caching</PackageId>
-    <PackageTags>microsoft;azure;azurehealthdataservices;fhir;</PackageTags>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <PackageIcon>Icon.png</PackageIcon>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-
-    <AnalysisLevel>latest</AnalysisLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
-    <IsPackable>true</IsPackable>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <DebugType>portable</DebugType>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <Deterministic>true</Deterministic>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <RootNamespace>Microsoft.AzureHealth.DataServices.Caching</RootNamespace>
-    <Optimize Condition="'$(Configuration)'=='Release'">true</Optimize>
+    <AssemblyName>Microsoft.AzureHealth.DataServices.Caching</AssemblyName>
+    <Description>Caching library to assist with creating custom operations for Azure Health Data Services.</Description>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="..\.editorconfig" Link=".editorconfig" />
-    <None Include="Icon.png" Pack="true" PackagePath="\" />
-    <None Include="README.md" Pack="true" PackagePath="\" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.7.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.9" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 

src/Microsoft.AzureHealth.DataServices.Channels/Microsoft.AzureHealth.DataServices.Channels.csproj

@@ -1,56 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Company>Microsoft Corporation</Company>
-    <Product>Microsoft(R) Azure Health Data Services Toolkit</Product>
-    <Description>Channels extension library to assist with creating custom operations for Azure Health Data Services.</Description>
-    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-    <NeutralLanguage>en-US</NeutralLanguage>
-    <CurrentDate>$([System.DateTime]::Now.ToString(yyyyMMdd))</CurrentDate>
-    <Authors>Microsoft</Authors>
-
-    <TargetFramework>net6.0</TargetFramework>
-    <AssemblyName>Microsoft.AzureHealth.DataServices.Sdk.Channels</AssemblyName>
-
     <Title>Azure Health Data Services Toolkit Channels Extension library</Title>
     <PackageId>Microsoft.AzureHealth.DataServices.Channels.Extensions</PackageId>
-    <PackageTags>microsoft;azure;azurehealthdataservices;fhir;</PackageTags>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <PackageIcon>Icon.png</PackageIcon>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-
-    <AnalysisLevel>latest</AnalysisLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
-    <IsPackable>true</IsPackable>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <DebugType>portable</DebugType>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <Deterministic>true</Deterministic>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <RootNamespace>Microsoft.AzureHealth.DataServices.Channels</RootNamespace>
-    <Optimize Condition="'$(Configuration)'=='Release'">true</Optimize>
+    <AssemblyName>Microsoft.AzureHealth.DataServices.Channels.Extensions</AssemblyName>
+    <Description>Channels extension library to assist with creating custom operations for Azure Health Data Services.</Description>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="..\.editorconfig" Link=".editorconfig" />
-    <None Include="Icon.png" Pack="true" PackagePath="\" />
-    <None Include="README.md" Pack="true" PackagePath="\" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Azure.Messaging.EventGrid" Version="4.11.0" />
     <PackageReference Include="Azure.Messaging.EventHubs" Version="5.7.2" />
     <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.7.2" />
     <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.10.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>