Skip to content

Commit 6b77dbd

Browse files
heathsheaths
committed
Update version information
1 parent a4b6811 commit 6b77dbd

File tree

6 files changed

+26
-34
lines changed

6 files changed

+26
-34
lines changed

‎inc/Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<FileAlignment>512</FileAlignment>
11-
<RestorePackages>true</RestorePackages>
11+
<RestorePackages>false</RestorePackages>
1212
</PropertyGroup>
1313
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1414
<PropertyGroup>

‎src/PowerShell/PowerShell.csproj

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,7 @@
156156
<Sign>True</Sign>
157157
<SubType>Designer</SubType>
158158
</Content>
159-
<None Include="packages.config">
160-
<SubType>Designer</SubType>
161-
</None>
159+
<None Include="packages.config" />
162160
<None Include="PowerShell.nuspec" />
163161
</ItemGroup>
164162
<ItemGroup>
@@ -185,9 +183,8 @@
185183
</Content>
186184
</ItemGroup>
187185
<ItemGroup>
188-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
189-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
190-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
186+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
187+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
191188
</ItemGroup>
192189
<Import Project="$(IncludeDir)Common.targets" />
193190
<Import Project="$(IncludeDir)TextTemplating.targets" />
@@ -212,22 +209,22 @@
212209
</T4ParameterValues>
213210
</ItemGroup>
214211
</Target>
215-
<Target Name="BuildPackage" DependsOnTargets="CalculateVersion" Inputs="$(TargetPath);$(MSBuildProjectName).nuspec" Outputs="$(OutputPath)MSI.$(BuildVersionSimple).nupkg">
212+
<Target Name="BuildPackage" DependsOnTargets="CalculateVersion" Inputs="$(TargetPath);$(MSBuildProjectName).nuspec" Outputs="$(OutputPath)MSI.$(NuGetPackageVersion).nupkg">
216213
<PropertyGroup>
217214
<ProjectPath>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ProjectPath>
218-
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "SolutionDir=$(SolutionDir);Configuration=$(Configuration);Platform=$(Platform);Version=$(BuildVersionSimple)" -OutputDirectory "$(OutputPath.TrimEnd('\'))" -Symbols -NonInteractive -NoPackageAnalysis</BuildCommand>
215+
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "SolutionDir=$(SolutionDir);Configuration=$(Configuration);Platform=$(Platform);Version=$(NuGetPackageVersion)" -OutputDirectory "$(OutputPath.TrimEnd('\'))" -Symbols -NonInteractive -NoPackageAnalysis</BuildCommand>
219216
</PropertyGroup>
220-
<Exec Command="$(BuildCommand)" Outputs="$(OutputPath)MSI.$(BuildVersionSimple).nupkg">
217+
<Exec Command="$(BuildCommand)" Outputs="$(OutputPath)MSI.$(NuGetPackageVersion).nupkg">
221218
<Output TaskParameter="Outputs" ItemName="FileWrites" />
222219
</Exec>
223220
</Target>
224221
<Target Name="AfterBuild" DependsOnTargets="BuildPackage" />
225-
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.5.46\build\portable-net+win+wpa+wp+sl+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\portable-net+win+wpa+wp+sl+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets')" />
222+
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets')" />
226223
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
227224
<PropertyGroup>
228225
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
229226
</PropertyGroup>
230-
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\portable-net+win+wpa+wp+sl+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.5.46\build\portable-net+win+wpa+wp+sl+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets'))" />
227+
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets'))" />
231228
</Target>
232229
<!-- vim: set sw=2 ts=2 sts=2 ft=xml: -->
233-
</Project>
230+
</Project>

‎src/PowerShell/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Nerdbank.GitVersioning" version="1.5.46" targetFramework="net40" developmentDependency="true" />
4-
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net40" developmentDependency="true" />
5-
</packages>
3+
<package id="Nerdbank.GitVersioning" version="2.2.33" targetFramework="net35" developmentDependency="true" />
4+
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net35" developmentDependency="true" />
5+
</packages>

‎test/PowerShell.Test/PowerShell.Test.csproj

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,26 +129,25 @@
129129
<Content Include="Data\return.exe" />
130130
<Content Include="Data\test.cub" />
131131
</ItemGroup>
132-
<ItemGroup>
133-
<None Include="packages.config" />
134-
</ItemGroup>
135132
<ItemGroup>
136133
<AdditionalFiles Include="$(SolutionDir)inc\stylecop.json">
137134
<Visible>false</Visible>
138135
</AdditionalFiles>
139136
</ItemGroup>
140137
<ItemGroup>
141-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
142-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
143-
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
138+
<None Include="packages.config" />
139+
</ItemGroup>
140+
<ItemGroup>
141+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
142+
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
144143
</ItemGroup>
145144
<Import Project="$(IncludeDir)Common.targets" />
146-
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets')" />
145+
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets')" />
147146
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
148147
<PropertyGroup>
149148
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
150149
</PropertyGroup>
151-
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets'))" />
150+
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets'))" />
152151
</Target>
153152
<!-- vim: set sw=2 ts=2 sts=2 ft=xml: -->
154-
</Project>
153+
</Project>

‎test/PowerShell.Test/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Nerdbank.GitVersioning" version="1.5.46" targetFramework="net45" developmentDependency="true" />
4-
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
5-
</packages>
3+
<package id="Nerdbank.GitVersioning" version="2.2.33" targetFramework="net45" developmentDependency="true" />
4+
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net45" developmentDependency="true" />
5+
</packages>

‎version.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "3.2.0",
3+
"version": "3.3",
44
"publicReleaseRefSpec": [
55
"^refs/heads/master$"
66
],
77
"cloudBuild": {
88
"buildNumber": {
9-
"enabled": true,
10-
"includeCommitId": {
11-
"when": "nonPublicReleaseOnly",
12-
"where": "buildMetadata"
13-
}
9+
"enabled": true
1410
},
1511
"setVersionVariables": true
1612
}

0 commit comments

Comments
 (0)