Skip to content

Commit 21b2ce2

Browse files
dotnetjunkiedotnetjunkie
committed
Updated csproj files:
1. Project references are used instead of package references (as the MVC packages will now be released together) 2. Language version fixed to 9.0 3. PackageReleaseNotes fixed
1 parent 03fc144 commit 21b2ce2

File tree

7 files changed

+60
-16
lines changed

7 files changed

+60
-16
lines changed

‎src/SimpleInjector.Integration.AspNetCore.Mvc.Core/SimpleInjector.Integration.AspNetCore.Mvc.Core.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Integration library for ASP.NET Core MVC core features for Simple Injector. This includes controller integration.</Description>
44
<AssemblyTitle>Simple Injector ASP.NET Core MVC Core Integration</AssemblyTitle>
55
<NeutralLanguage>en-US</NeutralLanguage>
66
<VersionPrefix>5.1.1</VersionPrefix>
7-
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/5.0.0</PackageReleaseNotes>
7+
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/v5.1.1</PackageReleaseNotes>
88
<AssemblyVersion>5.0.0.0</AssemblyVersion>
99
<Authors>Simple Injector Contributors</Authors>
1010
<TargetFrameworks>netstandard2.0</TargetFrameworks>
@@ -22,14 +22,13 @@
2222
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
2323
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
2424
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
25-
<LangVersion>preview</LangVersion>
25+
<LangVersion>9.0</LangVersion>
2626
<Nullable>enable</Nullable>
2727
</PropertyGroup>
2828

2929
<ItemGroup>
3030
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.0" />
3131
<PackageReference Include="SimpleInjector" Version="5.1.0" />
32-
<PackageReference Include="SimpleInjector.Integration.AspNetCore" Version="5.1.1" />
3332
</ItemGroup>
3433

3534
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
@@ -40,6 +39,10 @@
4039
<ItemGroup>
4140
<None Include="..\Graphics\simpleinjector.png" Pack="true" PackagePath="" />
4241
</ItemGroup>
42+
43+
<ItemGroup>
44+
<ProjectReference Include="..\SimpleInjector.Integration.AspNetCore\SimpleInjector.Integration.AspNetCore.csproj" />
45+
</ItemGroup>
4346

4447
<Target Name="PostcompileScript" AfterTargets="Build" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
4548
<Exec Command="dotnet pack --no-build --configuration $(Configuration)" />

‎src/SimpleInjector.Integration.AspNetCore.Mvc.ViewFeatures/SimpleInjector.Integration.AspNetCore.Mvc.ViewFeatures.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Integration library for ASP.NET Core MVC view features for Simple Injector. This includes view component integration.</Description>
44
<AssemblyTitle>Simple Injector ASP.NET Core MVC View Features Integration</AssemblyTitle>
55
<NeutralLanguage>en-US</NeutralLanguage>
66
<VersionPrefix>5.1.1</VersionPrefix>
7-
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/5.0.0</PackageReleaseNotes>
7+
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/v5.1.1</PackageReleaseNotes>
88
<AssemblyVersion>5.0.0.0</AssemblyVersion>
99
<Authors>Simple Injector Contributors</Authors>
1010
<TargetFrameworks>netstandard2.0</TargetFrameworks>
@@ -22,7 +22,7 @@
2222
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
2323
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
2424
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
25-
<LangVersion>preview</LangVersion>
25+
<LangVersion>9.0</LangVersion>
2626
<Nullable>enable</Nullable>
2727
<PackageReleaseNotes></PackageReleaseNotes>
2828
</PropertyGroup>
@@ -31,7 +31,6 @@
3131
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.0" />
3232
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.0" />
3333
<PackageReference Include="SimpleInjector" Version="5.1.0" />
34-
<PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc.Core" Version="5.1.1" />
3534
</ItemGroup>
3635

3736
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
@@ -43,6 +42,10 @@
4342
<None Include="..\Graphics\simpleinjector.png" Pack="true" PackagePath="" />
4443
</ItemGroup>
4544

45+
<ItemGroup>
46+
<ProjectReference Include="..\SimpleInjector.Integration.AspNetCore.Mvc.Core\SimpleInjector.Integration.AspNetCore.Mvc.Core.csproj" />
47+
</ItemGroup>
48+
4649
<Target Name="PostcompileScript" AfterTargets="Build" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
4750
<Exec Command="dotnet pack --no-build --configuration $(Configuration)" />
4851
</Target>

‎src/SimpleInjector.Integration.AspNetCore.Mvc/SimpleInjector.Integration.AspNetCore.Mvc.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Integration library for ASP.NET Core MVC for Simple Injector. This package adds tag helper and Razor Pages integration on top of the core functionality.</Description>
44
<AssemblyTitle>Simple Injector ASP.NET Core MVC Integration</AssemblyTitle>
55
<NeutralLanguage>en-US</NeutralLanguage>
66
<VersionPrefix>5.1.1</VersionPrefix>
7-
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/5.0.0</PackageReleaseNotes>
7+
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/v5.1.1</PackageReleaseNotes>
88
<AssemblyVersion>5.0.0.0</AssemblyVersion>
99
<Authors>Simple Injector Contributors</Authors>
1010
<TargetFrameworks>netstandard2.0</TargetFrameworks>
@@ -24,15 +24,14 @@
2424
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
2525
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
2626
<GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
27-
<LangVersion>preview</LangVersion>
27+
<LangVersion>9.0</LangVersion>
2828
<Nullable>enable</Nullable>
2929
</PropertyGroup>
3030

3131
<ItemGroup>
3232
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.0.0" />
3333
<PackageReference Include="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.0.0" />
3434
<PackageReference Include="SimpleInjector" Version="5.1.0" />
35-
<PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc.ViewFeatures" Version="5.1.1" />
3635
</ItemGroup>
3736

3837
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
@@ -43,6 +42,10 @@
4342
<ItemGroup>
4443
<None Include="..\Graphics\simpleinjector.png" Pack="true" PackagePath="" />
4544
</ItemGroup>
45+
46+
<ItemGroup>
47+
<ProjectReference Include="..\SimpleInjector.Integration.AspNetCore.Mvc.ViewFeatures\SimpleInjector.Integration.AspNetCore.Mvc.ViewFeatures.csproj" />
48+
</ItemGroup>
4649

4750
<Target Name="PostcompileScript" AfterTargets="Build" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
4851
<Exec Command="dotnet pack --no-build --configuration $(Configuration)" />

‎src/SimpleInjector.Integration.AspNetCore/SimpleInjector.Integration.AspNetCore.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AssemblyTitle>Simple Injector ASP.NET Core Integration</AssemblyTitle>
55
<NeutralLanguage>en-US</NeutralLanguage>
66
<VersionPrefix>5.1.1</VersionPrefix>
7-
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/5.1.0</PackageReleaseNotes>
7+
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/v5.1.1</PackageReleaseNotes>
88
<AssemblyVersion>5.0.0.0</AssemblyVersion>
99
<Authors>Simple Injector Contributors</Authors>
1010
<TargetFrameworks>netstandard2.0</TargetFrameworks>
@@ -24,7 +24,7 @@
2424
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
2525
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
2626
<GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
27-
<LangVersion>preview</LangVersion>
27+
<LangVersion>9.0</LangVersion>
2828
<Nullable>enable</Nullable>
2929
</PropertyGroup>
3030

‎src/SimpleInjector.Integration.GenericHost/SimpleInjector.Integration.GenericHost.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
2727
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
2828
<GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
29-
<LangVersion>preview</LangVersion>
29+
<LangVersion>9.0</LangVersion>
3030
<Nullable>enable</Nullable>
3131
<PackageReleaseNotes></PackageReleaseNotes>
3232
</PropertyGroup>

‎src/SimpleInjector.Integration.ServiceCollection/SimpleInjector.Integration.ServiceCollection.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
2727
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
2828
<GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
29-
<LangVersion>preview</LangVersion>
29+
<LangVersion>9.0</LangVersion>
3030
<Nullable>enable</Nullable>
3131
<PackageReleaseNotes></PackageReleaseNotes>
3232
</PropertyGroup>

‎src/publish2nuget.bat‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
@ECHO OFF
2+
REM This bat file allows publishing packages to Nuget.
3+
REM Usage:
4+
REM publish2nuget.bat [version] [NuGet API key]
5+
6+
set version=%1
7+
set superSecretApiKey=%2
8+
9+
IF %version%=="" (
10+
ECHO Please supply the version number and API key that should be published to nuget. Example: "%0 1.6.2-beta4 00000000-0000-0000-0000-000000000000"
11+
GOTO :EOF
12+
)
13+
IF %superSecretApiKey%=="" (
14+
ECHO Please supply the version number and API key that should be published to nuget. Example: "%0 1.6.2-beta4 00000000-0000-0000-0000-000000000000"
15+
GOTO :EOF
16+
)
17+
18+
set packageDirectory=Releases\v%version%
19+
set options=%superSecretApiKey% -Verbosity detailed -source https://www.nuget.org/api/v2/package
20+
set nugetexe=..\..\nuget.exe
21+
22+
IF NOT EXIST %packageDirectory% (
23+
ECHO The directory "%packageDirectory%" could not be found.
24+
GOTO :EOF
25+
)
26+
27+
IF NOT EXIST %nugetexe% (
28+
echo %nugetexe% not found. Please download nuget.exe from https://www.nuget.org/nuget.exe.
29+
GOTO :EOF
30+
)
31+
32+
%nugetexe% push %packageDirectory%\*.%version%.nupkg %options%
33+
34+
35+
echo Done!

0 commit comments

Comments
 (0)